[FFmpeg-cvslog] lavf/mov: Confine 0x00000000 to raw/ twos fourcc mapping to version 0 sample descriptions

[Mats Peterson]

ffmpeg | branch: master | Mats Peterson <matsp888-at-yahoo.com at ffmpeg.org> | Wed Jan 13 00:32:20 2016 +0100| [b58cfa616c169c90166938608e7135cdab5820e0] | committer: Michael Niedermayer

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.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 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)