From 8a774d3deb1e0f8e2f89883227ce50873309e4ce Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Wed, 12 Jan 2011 00:52:47 +0000 Subject: Do not allocate unused swscale context when libavfilter is compiled in Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index a468f47de7..1c7ccbb313 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2207,6 +2207,7 @@ static int transcode(AVFormatContext **output_files, codec->height != icodec->height || (codec->pix_fmt != icodec->pix_fmt)); if (ost->video_resample) { +#if !CONFIG_AVFILTER avcodec_get_frame_defaults(&ost->pict_tmp); if(avpicture_alloc((AVPicture*)&ost->pict_tmp, codec->pix_fmt, codec->width, codec->height)) { @@ -2227,7 +2228,6 @@ static int transcode(AVFormatContext **output_files, ffmpeg_exit(1); } -#if !CONFIG_AVFILTER ost->original_height = icodec->height; ost->original_width = icodec->width; #endif -- cgit v1.2.3