0.9.2
authorCarl Hetherington <cth@carlh.net>
Sat, 4 Aug 2012 13:04:03 +0000 (14:04 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 4 Aug 2012 13:04:03 +0000 (14:04 +0100)
src/lib/decoder.cc

index 4ffe049b8a29786eda6b75582458f8825c41a66a..a35468d069aaaf2e49e0bdf653b7d5f76937d80e 100644 (file)
@@ -26,7 +26,7 @@
 extern "C" {
 #include <libavfilter/avfiltergraph.h>
 #include <libavfilter/buffersrc.h>
-#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 61 && LIBAVFILTER_VERSION_MINOR <= 77
+#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 53 && LIBAVFILTER_VERSION_MINOR <= 77
 #include <libavfilter/avcodec.h>
 #include <libavfilter/buffersink.h>
 #endif
@@ -333,7 +333,7 @@ Decoder::process_video (AVFrame* frame)
                return;
        }
 
-#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 61
+#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 53 && LIBAVFILTER_VERSION_MINOR <= 61
 
        if (av_vsrc_buffer_add_frame (_buffer_src_context, frame, 0) < 0) {
                throw DecodeError ("could not push buffer into filter chain.");
@@ -360,13 +360,13 @@ Decoder::process_video (AVFrame* frame)
 #endif 
        
 //#ifdef DVDOMATIC_FFMPEG_0_8_3
-#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 61  
+#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 23 && LIBAVFILTER_VERSION_MINOR <= 61       
        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
+#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 53
                
                int r = avfilter_request_frame (_buffer_sink_context->inputs[0]);
                if (r < 0) {