Commit 8a774d3d authored by Baptiste Coudurier's avatar Baptiste Coudurier

Do not allocate unused swscale context when libavfilter is compiled in

Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e83c716e
...@@ -2207,6 +2207,7 @@ static int transcode(AVFormatContext **output_files, ...@@ -2207,6 +2207,7 @@ static int transcode(AVFormatContext **output_files,
codec->height != icodec->height || codec->height != icodec->height ||
(codec->pix_fmt != icodec->pix_fmt)); (codec->pix_fmt != icodec->pix_fmt));
if (ost->video_resample) { if (ost->video_resample) {
#if !CONFIG_AVFILTER
avcodec_get_frame_defaults(&ost->pict_tmp); avcodec_get_frame_defaults(&ost->pict_tmp);
if(avpicture_alloc((AVPicture*)&ost->pict_tmp, codec->pix_fmt, if(avpicture_alloc((AVPicture*)&ost->pict_tmp, codec->pix_fmt,
codec->width, codec->height)) { codec->width, codec->height)) {
...@@ -2227,7 +2228,6 @@ static int transcode(AVFormatContext **output_files, ...@@ -2227,7 +2228,6 @@ static int transcode(AVFormatContext **output_files,
ffmpeg_exit(1); ffmpeg_exit(1);
} }
#if !CONFIG_AVFILTER
ost->original_height = icodec->height; ost->original_height = icodec->height;
ost->original_width = icodec->width; ost->original_width = icodec->width;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment