From 4a2e4b684a6f0a20578c73b76b8a2f300610acae Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 31 Jan 2013 17:41:29 +0100
Subject: build: make it work on somewhat older ffmpeg versions

Tested with n0.10.4. All these version checks are rather tricky,
because Libav and FFmpeg change the same thing at slightly different
versions.
---
 compat/libav.h         | 2 +-
 stream/stream_lavf.c   | 2 +-
 video/fmt-conversion.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compat/libav.h b/compat/libav.h
index 9dd0ee7887..62ce1bb529 100644
--- a/compat/libav.h
+++ b/compat/libav.h
@@ -32,7 +32,7 @@
 #define AV_CODEC_ID_SUBRIP CODEC_ID_TEXT
 #endif
 
-#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 27, 0)
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 36, 0)
 #define av_get_packed_sample_fmt(x) (x)
 #endif
 
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index 2fa7764d44..4afdc7244d 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -189,7 +189,7 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
         goto out;
     }
 
-#if LIBAVFORMAT_VERSION_MICRO >= 100
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 0, 0)
     if (avio->av_class) {
         uint8_t *mt = NULL;
         if (av_opt_get(avio, "mime_type", AV_OPT_SEARCH_CHILDREN, &mt) >= 0)
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index b37bd6c441..a98dc97d51 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -133,7 +133,7 @@ static const struct {
 #endif
 
     // ffmpeg only
-#if LIBAVUTIL_VERSION_MICRO >= 100
+#if LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT > AV_VERSION_INT(52, 0, 0)
     {IMGFMT_420P12_LE,  PIX_FMT_YUV420P12LE},
     {IMGFMT_420P12_BE,  PIX_FMT_YUV420P12BE},
     {IMGFMT_420P14_LE,  PIX_FMT_YUV420P14LE},
-- 
cgit v1.2.3