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

Fix compilation error when CONFIG_AVFILTER is not defined. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Thierry Foucu 2011-03-16 13:37:41 -07:00 committed by Michael Niedermayer
parent 6f1260f870
commit a7844c580d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffmpeg.c
View File

@ -1698,7 +1698,11 @@ static int output_packet(AVInputStream *ist, int ist_index,
av_init_packet(&opkt); av_init_packet(&opkt);
if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes) if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
#if !CONFIG_AVFILTER
continue;
#else
goto cont; goto cont;
#endif
/* no reencoding needed : output the packet directly */ /* no reencoding needed : output the packet directly */
/* force the input stream PTS */ /* force the input stream PTS */
@ -1746,8 +1750,8 @@ static int output_packet(AVInputStream *ist, int ist_index,
ost->frame_number++; ost->frame_number++;
av_free_packet(&opkt); av_free_packet(&opkt);
} }
cont:
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
cont:
frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]); ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);
if(ost->picref) if(ost->picref)
@ -3402,7 +3406,7 @@ static void new_video_stream(AVFormatContext *oc, int file_idx)
codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO); codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
codec = avcodec_find_encoder(codec_id); codec = avcodec_find_encoder(codec_id);
} }
#if CONFIG_AVFILTER
if(frame_aspect_ratio > 0){ if(frame_aspect_ratio > 0){
i = vfilters ? strlen(vfilters) : 0; i = vfilters ? strlen(vfilters) : 0;
vfilters = av_realloc(vfilters, i+100); vfilters = av_realloc(vfilters, i+100);
@ -3412,6 +3416,7 @@ static void new_video_stream(AVFormatContext *oc, int file_idx)
ost->avfilter= vfilters; ost->avfilter= vfilters;
vfilters= NULL; vfilters= NULL;
#endif
} }
avcodec_get_context_defaults3(st->codec, codec); avcodec_get_context_defaults3(st->codec, codec);