diff options
| author | Max Kellermann <max@duempel.org> | 2011-05-09 21:17:09 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-01-04 21:47:56 +0100 |
| commit | fbf3edf07d55d722b114e5e33d02cb63ece6b627 (patch) | |
| tree | c119222dfbf0adfdf27ebf66282a36cd0948ed65 /src/decoder | |
| parent | 76fcf258982f69fd1e4aec7bda99b81b9ccb3e95 (diff) | |
| download | mpd-fbf3edf07d55d722b114e5e33d02cb63ece6b627.tar.gz mpd-fbf3edf07d55d722b114e5e33d02cb63ece6b627.tar.xz mpd-fbf3edf07d55d722b114e5e33d02cb63ece6b627.zip | |
decoder/ffpmeg: don't use av_metadata_conv() in ffmpeg 0.7
It's a no-op and deprecated.
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/ffmpeg_decoder_plugin.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |