Tweak to build and maybe run with current FFmpeg git.
authorCarl Hetherington <cth@carlh.net>
Sun, 22 Jul 2012 00:17:45 +0000 (01:17 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 22 Jul 2012 00:17:45 +0000 (01:17 +0100)
src/lib/decoder.cc

index 38de4e3a159ebc21163a9dfb2dbcc389811e2f5a..9cbd93405e2317a709f649a5b1ef70e2bea310a1 100644 (file)
@@ -25,7 +25,7 @@
 #include <stdint.h>
 extern "C" {
 #include <libavfilter/avfiltergraph.h>
-#include <libavfilter/vsrc_buffer.h>
+#include <libavfilter/buffersrc.h>
 #ifndef DVDOMATIC_FFMPEG_0_8_3
 #include <libavfilter/avcodec.h>
 #include <libavfilter/buffersink.h>
@@ -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");