From fbf3edf07d55d722b114e5e33d02cb63ece6b627 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 9 May 2011 21:17:09 +0200
Subject: decoder/ffpmeg: don't use av_metadata_conv() in ffmpeg 0.7

It's a no-op and deprecated.
---
 src/decoder/ffmpeg_decoder_plugin.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 9a3961b50..6a746f94a 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -568,7 +568,9 @@ ffmpeg_stream_tag(struct input_stream *is)
 		: 0;
 
 #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(31<<8)+0)
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,101,0)
 	av_metadata_conv(f, NULL, f->iformat->metadata_conv);
+#endif
 
 	for (unsigned i = 0; i < sizeof(ffmpeg_tag_maps)/sizeof(ffmpeg_tag_map); i++) {
 		int idx = ffmpeg_find_audio_stream(f);
-- 
cgit v1.2.3