diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-03-11 22:16:38 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-03-11 22:16:38 +0000 |
| commit | 912c94f3ffdd755d699fdb82d05d55f00759dff1 (patch) | |
| tree | 994da155c15a4ff75685b3c072476e81da8776e7 /libavformat/matroska.c | |
| parent | 8736d68a80f2ba1bb034b0ad67575d3a7e477cb7 (diff) | |
| download | ffmpeg-912c94f3ffdd755d699fdb82d05d55f00759dff1.tar.gz | |
use codec_get_id() instead of deprecated codec_get_[bmp/wav]_id()
Originally committed as revision 8327 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 094c859feb..0235e18788 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); } |