Confine the 0x00000000 to 'raw '/'twos' fourcc mapping to old version 0 sound sample descriptions, since they are the only valid sample descriptions for this type of mapping.

Mats
>From 26a7e0cd804c6819ace1ffb78a4bf1869a4eec11 Mon Sep 17 00:00:00 2001
From: Mats Peterson <matsp...@yahoo.com>
Date: Wed, 13 Jan 2016 00:17:50 +0100
Subject: [PATCH] lavf/mov: Confine 0x00000000 to raw/twos fourcc mapping to version 0 sample descriptions

Confine the 0x00000000 to 'raw '/'twos' fourcc mapping to old version 0
sound sample descriptions, since they are the only valid sample
descriptions for this type of mapping.

---
 libavformat/mov.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 98c2f51..4cc5ff2 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1863,7 +1863,7 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb,
         }
     }
 
-    if (sc->format == 0) {
+    if (version == 0 && sc->format == 0) {
         if (st->codec->bits_per_coded_sample == 8)
             st->codec->codec_id = mov_codec_id(st, MKTAG('r','a','w',' '));
         else if (st->codec->bits_per_coded_sample == 16)
-- 
1.7.10.4

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to