[vlc-commits] demux: asf: fix multiple compressed payload regression (fix #9846)

Francois Cartegnie git at videolan.org
Sun Feb 9 17:45:00 CET 2014


vlc/vlc-2.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Nov 16 00:12:47 2013 +0900| [974b8b1247a815d94b14bbe28dfd48cdf1ad41dd] | committer: Felix Paul Kühne

demux: asf: fix multiple compressed payload regression (fix #9846)

Regression introduced by 6eddafe741954803ec2928d26fb7566bd07a3601

(cherry picked from commit 1c7b3420ede14f56b1c340fbfcd9bc2db9d8e4e3)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=974b8b1247a815d94b14bbe28dfd48cdf1ad41dd
---

 modules/demux/asf/asf.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 248666f..0ee2488 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -548,7 +548,10 @@ static int DemuxPayload(demux_t *p_demux, struct asf_packet_t *pkt, int i_payloa
     {
         int i_sub_payload_data_length = i_payload_data_length;
         if( i_replicated_data_length == 1 )
+        {
             i_sub_payload_data_length = pkt->p_peek[pkt->i_skip++];
+            i_payload_data_length--;
+        }
 
         stream_Read(p_demux->s, NULL, pkt->i_skip);
 



More information about the vlc-commits mailing list