remove deprecated codec_get_{bmp,wav}_{id,tag}()

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9530 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 2e95f377e2cd0719cb333f816b4af2e86d78cc20..3b8c73688954c804ff563a48840dbeeed1e0a0e8 100644 (file)
--- 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 863aec10a372f5b9833f9896ba536d38c7d70060..274d18487204bde7f7841fae974e066098f1fb65 100644 (file)
--- 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