From: Alexandra Hájková <alexandra.khirnova@gmail.com>
Date: Fri, 24 Jul 2015 09:22:56 +0000 (+0200)
Subject: asfdec: interpret the first flag in an asf packet as length flag
X-Git-Tag: android-x86-7.1-r1~252^2~2178
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe;p=android-x86%2Fexternal-ffmpeg.git

asfdec: interpret the first flag in an asf packet as length flag

if the error correction flag is not set, a packet starts with payload

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 752d45c2f0..642ccb2ca3 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1308,12 +1308,14 @@ static int asf_read_packet_header(AVFormatContext *s)
 
     asf->packet_offset = avio_tell(pb);
     error_flags = avio_r8(pb); // read Error Correction Flags
-    if (error_flags & ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT)
+    if (error_flags & ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT) {
         if (!(error_flags & ASF_ERROR_CORRECTION_LENGTH_TYPE)) {
             size = error_flags & ASF_PACKET_ERROR_CORRECTION_DATA_SIZE;
             avio_skip(pb, size);
         }
-    len_flags       = avio_r8(pb);
+        len_flags       = avio_r8(pb);
+    } else
+        len_flags = error_flags;
     asf->prop_flags = avio_r8(pb);
     READ_LEN(len_flags & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE,
              ASF_PPI_FLAG_PACKET_LENGTH_FIELD_, asf->packet_size_internal);