mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
matroskadec: parse the WAVEFORMATEX header and discard it from extradata
Originally committed as revision 16672 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5a44906d8e
commit
68a71451f6
@ -1201,8 +1201,13 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
||||
} else if (!strcmp(track->codec_id, "A_MS/ACM")
|
||||
&& track->codec_priv.size >= 18
|
||||
&& track->codec_priv.data != NULL) {
|
||||
uint16_t tag = AV_RL16(track->codec_priv.data);
|
||||
codec_id = codec_get_id(codec_wav_tags, tag);
|
||||
ByteIOContext b;
|
||||
init_put_byte(&b, track->codec_priv.data, track->codec_priv.size,
|
||||
URL_RDONLY, NULL, NULL, NULL, NULL);
|
||||
get_wav_header(&b, st->codec, track->codec_priv.size);
|
||||
codec_id = st->codec->codec_id;
|
||||
extradata_offset = 18;
|
||||
track->codec_priv.size -= extradata_offset;
|
||||
} else if (!strcmp(track->codec_id, "V_QUICKTIME")
|
||||
&& (track->codec_priv.size >= 86)
|
||||
&& (track->codec_priv.data != NULL)) {
|
||||
|
Loading…
Reference in New Issue
Block a user