diff options
| author | Mats Peterson <matsp888-at-yahoo.com@ffmpeg.org> | 2016-01-13 00:32:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 03:38:43 +0100 |
| commit | b58cfa616c169c90166938608e7135cdab5820e0 (patch) | |
| tree | d6ac2fc8bc90c782a8848430c70f7796855af113 /libavformat/mov.c | |
| parent | 8f4c3e4b92212d98f5b9ca2dee13e076effe9589 (diff) | |
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@niedermayer.cc>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 98c2f51931..4cc5ff2ae6 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) |