diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-03 08:23:08 -0800 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2013-03-07 09:35:24 +0200 |
commit | 54b298fe5650c124c29a8283cfd05024ac409d3a (patch) | |
tree | be859b9f5bf9bd26c815acb7f759200f318def2c /avconv.c | |
parent | 64e4386974b976070fc22ec3153e163de4a3e14e (diff) | |
download | ffmpeg-54b298fe5650c124c29a8283cfd05024ac409d3a.tar.gz |
lavc: Deprecate the deinterlace functions in libavcodec
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -404,6 +404,7 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost, } } +#if FF_API_DEINTERLACE static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void **bufp) { AVCodecContext *dec; @@ -442,6 +443,7 @@ static void pre_process_video_frame(InputStream *ist, AVPicture *picture, void * *picture = *picture2; *bufp = buf; } +#endif static void do_subtitle_out(AVFormatContext *s, OutputStream *ost, @@ -1181,7 +1183,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) decoded_frame->pts = guess_correct_pts(&ist->pts_ctx, decoded_frame->pkt_pts, decoded_frame->pkt_dts); pkt->size = 0; +#if FF_API_DEINTERLACE pre_process_video_frame(ist, (AVPicture *)decoded_frame, &buffer_to_free); +#endif rate_emu_sleep(ist); |