Commit 020edce6 authored by aurel's avatar aurel

use codec_get_id() instead of deprecated codec_get_[bmp/wav]_id()

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8327 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent fc6664de
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
#include "avformat.h" #include "avformat.h"
/* For codec_get_bmp_id and codec_get_wav_id. */ /* For codec_get_id(). */
#include "riff.h" #include "riff.h"
#include "intfloat_readwrite.h" #include "intfloat_readwrite.h"
...@@ -2226,7 +2226,7 @@ matroska_read_header (AVFormatContext *s, ...@@ -2226,7 +2226,7 @@ matroska_read_header (AVFormatContext *s,
p = (unsigned char *)track->codec_priv + 16; p = (unsigned char *)track->codec_priv + 16;
((MatroskaVideoTrack *)track)->fourcc = (p[3] << 24) | ((MatroskaVideoTrack *)track)->fourcc = (p[3] << 24) |
(p[2] << 16) | (p[1] << 8) | p[0]; (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, ...@@ -2242,7 +2242,7 @@ matroska_read_header (AVFormatContext *s,
/* Offset of wFormatTag. Stored in LE. */ /* Offset of wFormatTag. Stored in LE. */
p = (unsigned char *)track->codec_priv; p = (unsigned char *)track->codec_priv;
tag = (p[1] << 8) | p[0]; tag = (p[1] << 8) | p[0];
codec_id = codec_get_wav_id(tag); codec_id = codec_get_id(codec_wav_tags, tag);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment