From 9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= Date: Fri, 24 Jul 2015 11:22:56 +0200 Subject: [PATCH] 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 --- libavformat/asfdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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);