From 45eb286ab51444352f2e0fef0fe1d5e5663c8c6c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 22 Jul 2012 01:17:45 +0100 Subject: Tweak to build and maybe run with current FFmpeg git. --- src/lib/decoder.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/lib/decoder.cc') diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 38de4e3a1..9cbd93405 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -25,7 +25,7 @@ #include extern "C" { #include -#include +#include #ifndef DVDOMATIC_FFMPEG_0_8_3 #include #include @@ -242,16 +242,20 @@ Decoder::process_video (AVFrame* frame) #else - if (av_vsrc_buffer_add_frame (_buffer_src_context, frame, 0) < 0) { + if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) { throw DecodeError ("could not push buffer into filter chain."); } #endif +#ifdef DVDOMATIC_FFMPEG_0_8_3 while (avfilter_poll_frame (_buffer_sink_context->inputs[0])) { +#else + while (av_buffersink_read (_buffer_sink_context, 0)) { +#endif #ifdef DVDOMATIC_FFMPEG_0_8_3 - + int r = avfilter_request_frame (_buffer_sink_context->inputs[0]); if (r < 0) { throw DecodeError ("could not request filtered frame"); -- cgit v1.2.3