[Ffmpeg-cvslog] CVS: ffmpeg/libavformat asf.c,1.76,1.77

Michael Niedermayer CVS michael
Tue Apr 19 02:35:11 CEST 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv32598

Modified Files:
	asf.c 
Log Message:
fixing demuxing of DV5700.asf


Index: asf.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- asf.c	17 Mar 2005 01:25:00 -0000	1.76
+++ asf.c	19 Apr 2005 00:35:08 -0000	1.77
@@ -182,7 +182,7 @@
 	    asf->packet_size = asf->hdr.max_pktsize;
             asf->nb_packets = asf->hdr.packets_count;
         } else if (!memcmp(&g, &stream_header, sizeof(GUID))) {
-            int type, total_size, type_specific_size;
+            int type, total_size, type_specific_size, sizeX;
             unsigned int tag1;
             int64_t pos1, pos2;
 
@@ -264,7 +264,7 @@
                 get_le32(pb);
                 get_byte(pb);
                 size = get_le16(pb); /* size */
-                get_le32(pb); /* size */
+                sizeX= get_le32(pb); /* size */
                 st->codec.width = get_le32(pb);
 		st->codec.height = get_le32(pb);
                 /* not available for asf */
@@ -272,6 +272,8 @@
 		st->codec.bits_per_sample = get_le16(pb); /* depth */
                 tag1 = get_le32(pb);
 		url_fskip(pb, 20);
+//                av_log(NULL, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX);
+                size= sizeX;
 		if (size > 40) {
 		    st->codec.extradata_size = size - 40;
 		    st->codec.extradata = av_mallocz(st->codec.extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);





More information about the ffmpeg-cvslog mailing list