From 8d45d0d104c9f946cc8260d0fd335d34bf160e2c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 12 Jan 2012 18:28:19 +0100
Subject: decoder/ffmpeg: raise version dependency for
 avformat_find_stream_info()

This function was added when the libavformat version was 53.2.0, but
the actual release 53.2.0 did not have it.
---
 src/decoder/ffmpeg_decoder_plugin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/decoder/ffmpeg_decoder_plugin.c')

diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index d8650e2f7..91376576a 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -443,7 +443,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
 		return;
 	}
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,2,0)
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,6,0)
 	const int find_result =
 		avformat_find_stream_info(format_context, NULL);
 #else
@@ -648,7 +648,7 @@ ffmpeg_stream_tag(struct input_stream *is)
 		return NULL;
 	}
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,2,0)
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,6,0)
 	const int find_result =
 		avformat_find_stream_info(f, NULL);
 #else
-- 
cgit v1.2.3


From 39d52762d15fadb892d2d9163bc6b763e99b70f8 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 12 Jan 2012 18:45:18 +0100
Subject: decoder/ffmpeg: check libavutil version for AVDictionaryEntry

Require libavutil 51.5.0.
---
 src/decoder/ffmpeg_decoder_plugin.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/decoder/ffmpeg_decoder_plugin.c')

diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 91376576a..8f4cf8c12 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -40,8 +40,12 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavformat/avio.h>
+#include <libavutil/avutil.h>
 #include <libavutil/log.h>
 #include <libavutil/mathematics.h>
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
+#include <libavutil/dict.h>
+#endif
 #endif
 
 #undef G_LOG_DOMAIN
@@ -612,7 +616,7 @@ ffmpeg_copy_metadata(struct tag *tag,
 #endif
 		     const ffmpeg_tag_map tag_map)
 {
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,1,0)
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
 	AVDictionaryEntry *mt = NULL;
 
 	while ((mt = av_dict_get(m, tag_map.name, mt, 0)) != NULL)
-- 
cgit v1.2.3