diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 14:50:17 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 14:50:17 +0400 |
commit | 8cc5481d51bf746d9d43348af711dbf201bf336a (patch) | |
tree | 0a4102445621aecf2e34d8a6ee853e97d73525eb /ffmpeg.c | |
parent | 47f1af47b6cb763452c5bab3704ca965fccad25b (diff) | |
parent | 54b298fe5650c124c29a8283cfd05024ac409d3a (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Deprecate the deinterlace functions in libavcodec
h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band
Conflicts:
configure
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -681,6 +681,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; @@ -721,6 +722,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, @@ -1675,7 +1677,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) } pkt->size = 0; +#if FF_API_DEINTERLACE pre_process_video_frame(ist, (AVPicture *)decoded_frame, &buffer_to_free); +#endif rate_emu_sleep(ist); |