[FFmpeg-devel] [PATCH] remove deprecated codec_get_{bmp, wav}_{id, tag}()

[Mans Rullgard]

---
 libavformat/riff.c |   20 --------------------
 libavformat/riff.h |   16 ----------------
 2 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 2e95f37..3b8c736 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -258,26 +258,6 @@ enum CodecID av_codec_get_id(const AVCodecTag *tags[4], unsigned int tag)
     return CODEC_ID_NONE;
 }
 
-unsigned int codec_get_bmp_tag(int id)
-{
-    return codec_get_tag(codec_bmp_tags, id);
-}
-
-unsigned int codec_get_wav_tag(int id)
-{
-    return codec_get_tag(codec_wav_tags, id);
-}
-
-enum CodecID codec_get_bmp_id(unsigned int tag)
-{
-    return codec_get_id(codec_bmp_tags, tag);
-}
-
-enum CodecID codec_get_wav_id(unsigned int tag)
-{
-    return codec_get_id(codec_wav_tags, tag);
-}
-
 #ifdef CONFIG_MUXERS
 offset_t start_tag(ByteIOContext *pb, const char *tag)
 {
diff --git a/libavformat/riff.h b/libavformat/riff.h
index 863aec1..274d184 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -49,22 +49,6 @@ extern const AVCodecTag codec_wav_tags[];
 
 unsigned int codec_get_tag(const AVCodecTag *tags, int id);
 enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
-/**
- * @deprecated Use av_codec_get_tag instead.
- */
-unsigned int codec_get_bmp_tag(int id) attribute_deprecated;
-/**
- * @deprecated Use av_codec_get_tag instead.
- */
-unsigned int codec_get_wav_tag(int id) attribute_deprecated;
-/**
- * @deprecated Use av_codec_get_id instead.
- */
-enum CodecID codec_get_bmp_id(unsigned int tag) attribute_deprecated;
-/**
- * @deprecated Use av_codec_get_id instead.
- */
-enum CodecID codec_get_wav_id(unsigned int tag) attribute_deprecated;
 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
 
 #endif
-- 
1.5.2.2