diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-12 00:52:47 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-12 00:52:47 +0000 |
| commit | 8a774d3deb1e0f8e2f89883227ce50873309e4ce (patch) | |
| tree | a31e5b2d6300bfa3cccbfba7174ddc8eb0c9f0d9 /ffmpeg.c | |
| parent | e83c716e16c52fa56a78274408f7628e5dc719da (diff) | |
| download | ffmpeg-8a774d3deb1e0f8e2f89883227ce50873309e4ce.tar.gz | |
Do not allocate unused swscale context when libavfilter is compiled in
Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |