Merge commit '40ad05bab206c932a32171d45581080c914b06ec'

[ffmpeg] / libavformat / riffdec.c

diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index 1602c31169bdaccd8867ef0055c4824f2276959a..656a9ebcf8d08d25c61f555833c7b51760b4ac63 100644 (file)
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -61,15 +61,18 @@ enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid)
 static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par)
 {
     ff_asf_guid subformat;
-    int bps = avio_rl16(pb);
+    int bps;
+
+    bps = avio_rl16(pb);
     if (bps)
         par->bits_per_coded_sample = bps;
-
     par->channel_layout        = avio_rl32(pb); /* dwChannelMask */
 
     ff_get_guid(pb, &subformat);
     if (!memcmp(subformat + 4,
                 (const uint8_t[]){ FF_AMBISONIC_BASE_GUID }, 12) ||
+        !memcmp(subformat + 4,
+                (const uint8_t[]){ FF_BROKEN_BASE_GUID }, 12) ||
         !memcmp(subformat + 4,
                 (const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) {
         par->codec_tag = AV_RL32(subformat);