[SCM] libav/experimental: use codec_get_id() instead of deprecated codec_get_[bmp/wav]_id()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 912c94f3ffdd755d699fdb82d05d55f00759dff1
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Sun Mar 11 22:16:38 2007 +0000

    use codec_get_id() instead of deprecated codec_get_[bmp/wav]_id()
    
    Originally committed as revision 8327 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 094c859..0235e18 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -29,7 +29,7 @@
  */
 
 #include "avformat.h"
-/* For codec_get_bmp_id and codec_get_wav_id. */
+/* For codec_get_id(). */
 #include "riff.h"
 #include "intfloat_readwrite.h"
 
@@ -2226,7 +2226,7 @@ matroska_read_header (AVFormatContext    *s,
                 p = (unsigned char *)track->codec_priv + 16;
                 ((MatroskaVideoTrack *)track)->fourcc = (p[3] << 24) |
                                  (p[2] << 16) | (p[1] << 8) | p[0];
-                codec_id = codec_get_bmp_id(((MatroskaVideoTrack *)track)->fourcc);
+                codec_id = codec_get_id(codec_bmp_tags, ((MatroskaVideoTrack *)track)->fourcc);
 
             }
 
@@ -2242,7 +2242,7 @@ matroska_read_header (AVFormatContext    *s,
                 /* Offset of wFormatTag. Stored in LE. */
                 p = (unsigned char *)track->codec_priv;
                 tag = (p[1] << 8) | p[0];
-                codec_id = codec_get_wav_id(tag);
+                codec_id = codec_get_id(codec_wav_tags, tag);
 
             }
 

-- 
Libav/FFmpeg packaging