diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-08-04 14:04:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-08-04 14:04:03 +0100 |
| commit | d5df879d17994f6c741c36049b14df53bf11f37b (patch) | |
| tree | a70b1737f26fb1912a6d577a4d935d87720341e2 /src/lib/decoder.cc | |
| parent | 870f3906c93fa95ce421d8c8e3cb1935221bbcad (diff) | |
0.9.2
Diffstat (limited to 'src/lib/decoder.cc')
| -rw-r--r-- | src/lib/decoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 4ffe049b8..a35468d06 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -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) { |