diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-03 08:23:08 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 21:11:48 +0100 |
| commit | 2cffe38df3df8ee1ec0fea0b2a2d3fed6e75da0d (patch) | |
| tree | dab880ca9080ed4e999efaef60a4ca54293b1be3 /ffmpeg.c | |
| parent | 9af8179cdb5eb05e9b29b0a4d0c363d22b674e95 (diff) | |
| download | ffmpeg-2cffe38df3df8ee1ec0fea0b2a2d3fed6e75da0d.tar.gz | |
Deprecate deinterlaced in libavcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -691,7 +691,7 @@ static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void * dec = ist->st->codec; /* deinterlace : must be done before any resize */ - if (do_deinterlace) { + if (FF_API_DEINTERLACE && do_deinterlace) { int size; /* create temporary picture */ @@ -1956,7 +1956,7 @@ static int init_input_stream(int ist_index, char *error, int error_len) return AVERROR(EINVAL); } - ist->dr1 = (codec->capabilities & CODEC_CAP_DR1) && !do_deinterlace; + ist->dr1 = (codec->capabilities & CODEC_CAP_DR1) && !(FF_API_DEINTERLACE && do_deinterlace); if (codec->type == AVMEDIA_TYPE_VIDEO && ist->dr1) { ist->st->codec->get_buffer = codec_get_buffer; ist->st->codec->release_buffer = codec_release_buffer; |