[vlc-devel] [PATCH vlc-2.2] avcodec: Remove fallback definitions of AVDictionaryEntry and av_dict_get

[Martin Storsjö]

These fallback definitions (moved to avcommon_compat.h in 5e192e1ed)
caused the avcodec plugin to use av_metadata_get for uses of av_dict_get,
while av_metadata_get is defined in libavformat (which the avcodec plugin
doesn't link to).

Both AVDictionaryEntry and av_dict_get were added in libavutil
51.5.0, which is earlier than the minimum required version of libavutil
(51.22.0).

This fixes using the avcodec plugin in builds with libavformat < 54
(such as debian wheezy).
---
 modules/codec/avcodec/avcommon_compat.h |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
index 12b598d..3fc14dc 100644
--- a/modules/codec/avcodec/avcommon_compat.h
+++ b/modules/codec/avcodec/avcommon_compat.h
@@ -513,11 +513,6 @@ enum {
     ( (LIBAVFORMAT_VERSION_MICRO <  100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
       (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
 
-#if LIBAVFORMAT_VERSION_MAJOR < 54
-# define AVDictionaryEntry AVMetadataTag
-# define av_dict_get av_metadata_get
-#endif
-
 #endif
 
 #endif
-- 
1.7.10.4