[FFmpeg-cvslog] Support more atrac3-in-mkv samples.

Carl Eugen Hoyos git at videolan.org
Sun Feb 10 14:45:17 CET 2013


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Feb 10 14:41:55 2013 +0100| [034a125c8c5178a5dd4a1ee8eb2168e15b0e94d7] | committer: Carl Eugen Hoyos

Support more atrac3-in-mkv samples.

The mkv demuxer sometimes finds 12 bytes of realmedia
extradata after the matroska real audio properties.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=034a125c8c5178a5dd4a1ee8eb2168e15b0e94d7
---

 libavcodec/atrac3.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 1e54784..c43de71 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -908,7 +908,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
                    avctx->channels, frame_factor);
             return AVERROR_INVALIDDATA;
         }
-    } else if (avctx->extradata_size == 10) {
+    } else if (avctx->extradata_size == 12 || avctx->extradata_size == 10) {
         /* Parse the extradata, RM format. */
         version                = bytestream_get_be32(&edata_ptr);
         samples_per_frame      = bytestream_get_be16(&edata_ptr);



More information about the ffmpeg-cvslog mailing list