RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compilation with --disable-avfilter. 

Fixes ticket #425.
This commit is contained in:
Carl Eugen Hoyos 2011-09-01 19:03:39 +02:00
parent 2f870e262e
commit c0e8bce349
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -1078,9 +1078,10 @@ static void do_video_resample(OutputStream *ost,
AVFrame **out_picture) AVFrame **out_picture)
{ {
int resample_changed = 0; int resample_changed = 0;
AVCodecContext *dec = ist->st->codec;
*out_picture = in_picture; *out_picture = in_picture;
#if !CONFIG_AVFILTER #if !CONFIG_AVFILTER
AVCodecContext *dec = ist->st->codec;
AVCodecContext *enc = ost->st->codec;
resample_changed = ost->resample_width != dec->width || resample_changed = ost->resample_width != dec->width ||
ost->resample_height != dec->height || ost->resample_height != dec->height ||
ost->resample_pix_fmt != dec->pix_fmt; ost->resample_pix_fmt != dec->pix_fmt;
@ -2320,6 +2321,7 @@ static int transcode(OutputFile *output_files,
do_pkt_dump = 1; do_pkt_dump = 1;
av_log_set_level(AV_LOG_DEBUG); av_log_set_level(AV_LOG_DEBUG);
} }
#if CONFIG_AVFILTER
if (key == 'c' || key == 'C'){ if (key == 'c' || key == 'C'){
char ret[4096], target[64], cmd[256], arg[256]={0}; char ret[4096], target[64], cmd[256], arg[256]={0};
double ts; double ts;
@ -2346,6 +2348,7 @@ static int transcode(OutputFile *output_files,
fprintf(stderr, "Parse error\n"); fprintf(stderr, "Parse error\n");
} }
} }
#endif
if (key == 'd' || key == 'D'){ if (key == 'd' || key == 'D'){
int debug=0; int debug=0;
if(key == 'D') { if(key == 'D') {