diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-28 20:53:48 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-28 21:32:14 +0100 |
| commit | 0dd4b52b63519a4fb8197b127b7548f7c94a1a32 (patch) | |
| tree | 91666c04968f4e3025061a1e65f078fea29c2a55 /src/decoder/FfmpegMetaData.cxx | |
| parent | 88c17926e4b5d5d88025b62a84a8c83991f397ff (diff) | |
| download | mpd-0dd4b52b63519a4fb8197b127b7548f7c94a1a32.tar.gz mpd-0dd4b52b63519a4fb8197b127b7548f7c94a1a32.tar.xz mpd-0dd4b52b63519a4fb8197b127b7548f7c94a1a32.zip | |
decoder/ffmpeg: require ffmpeg/libav 0.7.6
This is the version present in Ubuntu Oneiric, the oldest distribution
with gcc 4.6. Debian Squeeze is off target, because it has gcc 4.4,
which is unable to compile MPD anyway.
This commit drops all API compatibility hacks for older versions.
Diffstat (limited to 'src/decoder/FfmpegMetaData.cxx')
| -rw-r--r-- | src/decoder/FfmpegMetaData.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/decoder/FfmpegMetaData.cxx b/src/decoder/FfmpegMetaData.cxx index d3000591c..2d7ebbca3 100644 --- a/src/decoder/FfmpegMetaData.cxx +++ b/src/decoder/FfmpegMetaData.cxx @@ -29,9 +29,6 @@ #define G_LOG_DOMAIN "ffmpeg" static const struct tag_table ffmpeg_tags[] = { -#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,50,0) - { "author", TAG_ARTIST }, -#endif { "year", TAG_DATE }, { "author-sort", TAG_ARTIST_SORT }, { "album_artist", TAG_ALBUM_ARTIST }, @@ -53,8 +50,6 @@ ffmpeg_copy_metadata(enum tag_type type, type, mt->value); } -#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0) - static void ffmpeg_scan_pairs(AVDictionary *dict, const struct tag_handler *handler, void *handler_ctx) @@ -66,8 +61,6 @@ ffmpeg_scan_pairs(AVDictionary *dict, i->key, i->value); } -#endif - void ffmpeg_scan_dictionary(AVDictionary *dict, const struct tag_handler *handler, void *handler_ctx) @@ -81,8 +74,6 @@ ffmpeg_scan_dictionary(AVDictionary *dict, ffmpeg_copy_metadata(i->type, dict, i->name, handler, handler_ctx); -#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0) if (handler->pair != NULL) ffmpeg_scan_pairs(dict, handler, handler_ctx); -#endif } |