1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-28 04:06:12 +02:00

Support more atrac3-in-mkv samples.

The mkv demuxer sometimes finds 12 bytes of realmedia
extradata after the matroska real audio properties.
This commit is contained in:
Carl Eugen Hoyos 2013-02-10 14:41:55 +01:00
parent 2c5e4ae291
commit 034a125c8c

View File

@ -908,7 +908,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
avctx->channels, frame_factor); avctx->channels, frame_factor);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} else if (avctx->extradata_size == 10) { } else if (avctx->extradata_size == 12 || avctx->extradata_size == 10) {
/* Parse the extradata, RM format. */ /* Parse the extradata, RM format. */
version = bytestream_get_be32(&edata_ptr); version = bytestream_get_be32(&edata_ptr);
samples_per_frame = bytestream_get_be16(&edata_ptr); samples_per_frame = bytestream_get_be16(&edata_ptr);