X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fffmpeg_compatibility.cc;h=c47cdf5ce71f03c4ee4edfc31b85e013af1085c4;hb=abd57c6c2e8526eac93e9d0c9bd0b6080de1e6fa;hp=bdaf735a21f698eb33732a213f0423c735768d0b;hpb=2525b527f279a130155d40b7ee57057897270915;p=dcpomatic.git diff --git a/src/lib/ffmpeg_compatibility.cc b/src/lib/ffmpeg_compatibility.cc index bdaf735a2..c47cdf5ce 100644 --- a/src/lib/ffmpeg_compatibility.cc +++ b/src/lib/ffmpeg_compatibility.cc @@ -22,7 +22,7 @@ extern "C" { } #include "exceptions.h" -#ifdef DVDOMATIC_FFMPEG_0_8_3 +#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15 typedef struct { enum PixelFormat pix_fmt; @@ -64,7 +64,7 @@ avsink_query_formats (AVFilterContext* ctx) AVFilter* get_sink () { -#ifdef DVDOMATIC_FFMPEG_0_8_3 +#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15 /* XXX does this leak stuff? */ AVFilter* buffer_sink = new AVFilter; buffer_sink->name = av_strdup ("avsink"); @@ -100,7 +100,7 @@ get_sink () #endif } -#ifdef DVDOMATIC_FFMPEG_0_8_3 +#if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15 AVFilterInOut * avfilter_inout_alloc () {