[FFmpeg-cvslog] r26317 - trunk/ffmpeg.c

[bcoudurier]

Author: bcoudurier
Date: Wed Jan 12 01:52:47 2011
New Revision: 26317

Log:
Do not allocate unused swscale context when libavfilter is compiled in

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Wed Jan 12 01:33:22 2011	(r26316)
+++ trunk/ffmpeg.c	Wed Jan 12 01:52:47 2011	(r26317)
@@ -2207,6 +2207,7 @@ static int transcode(AVFormatContext **o
                                        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 **o
                         ffmpeg_exit(1);
                     }
 
-#if !CONFIG_AVFILTER
                     ost->original_height = icodec->height;
                     ost->original_width  = icodec->width;
 #endif