From a851fa7fecc7dbf681b046c8ddcd46bd842c792f Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 6 May 2011 11:10:02 +0200 Subject: [PATCH] ffmpeg: move resample_changed check within the #if !CONFIG_AVFILTER The check and the corresponding message in do_video_out() are unnecessary in the libavfilter path, as a similar check and message are performed within the buffer source. --- ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index d8997e2207..f9f08cd543 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1146,7 +1146,7 @@ static void do_video_out(AVFormatContext *s, AVFrame *in_picture, int *frame_size) { - int nb_frames, i, ret, resample_changed; + int nb_frames, i, ret, av_unused resample_changed; AVFrame *final_picture, *formatted_picture; AVCodecContext *enc, *dec; double sync_ipts; @@ -1193,6 +1193,7 @@ static void do_video_out(AVFormatContext *s, formatted_picture = in_picture; final_picture = formatted_picture; +#if !CONFIG_AVFILTER resample_changed = ost->resample_width != dec->width || ost->resample_height != dec->height || ost->resample_pix_fmt != dec->pix_fmt; @@ -1208,7 +1209,6 @@ static void do_video_out(AVFormatContext *s, ost->resample_pix_fmt = dec->pix_fmt; } -#if !CONFIG_AVFILTER ost->video_resample = dec->width != enc->width || dec->height != enc->height || dec->pix_fmt != enc->pix_fmt;