mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-28 13:40:55 +00:00
use codec_get_id() instead of deprecated codec_get_[bmp/wav]_id()
Originally committed as revision 8327 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
8736d68a80
commit
912c94f3ff
@ -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);
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user