From 3de20e51474c1b75633be530370ce2e1d2f075fe Mon Sep 17 00:00:00 2001 From: Fabrizio Date: Wed, 1 Mar 2006 09:55:49 +0000 Subject: [PATCH] gst/asfdemux/gstasfdemux.c: Read packet size, sequence and padsize in right order again Original commit message from CVS: * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_handle_data): Read packet size, sequence and padsize in right order again (fixes #332796; patch by: Fabrizio Gennari). --- ChangeLog | 6 ++++++ gst/asfdemux/gstasfdemux.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1f57a04ec..567255412f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-01 Tim-Philipp Müller + + * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_handle_data): + Read packet size, sequence and padsize in right order again + (fixes #332796; patch by: Fabrizio Gennari). + 2006-02-28 Edward Hervey * gst/iec958/ac3iec.c: diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index f7925b7f07..dbbaa329a1 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -2203,14 +2203,14 @@ gst_asf_demux_handle_data (GstASFDemux * demux, guint8 ** p_data, packet_info.multiple = ((flags & 0x01) == 0x01); + packet_length = + gst_asf_demux_get_var_length ((flags >> 5) & 0x03, p_data, p_size); + sequence = gst_asf_demux_get_var_length ((flags >> 1) & 0x03, p_data, p_size); packet_info.padsize = gst_asf_demux_get_var_length ((flags >> 3) & 0x03, p_data, p_size); - packet_length = - gst_asf_demux_get_var_length ((flags >> 5) & 0x03, p_data, p_size); - if (packet_length == 0) packet_length = demux->packet_size;