[Ffmpeg-cvslog] CVS: ffmpeg/libavformat ffm.c,1.45,1.46

[Alex Beregszaszi]

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

Modified Files:
	ffm.c 
Log Message:
fix feed read_header, avoid using put_tag in write_header, to be consistent with read_header, also some minor cosmetics

Index: ffm.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ffm.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ffm.c	23 Sep 2005 00:25:41 -0000	1.45
+++ ffm.c	12 Oct 2005 23:25:15 -0000	1.46
@@ -132,7 +132,7 @@
     ffm->packet_size = FFM_PACKET_SIZE;
 
     /* header */
-    put_tag(pb, "FFM1");
+    put_le32(pb, MKTAG('F', 'F', 'M', '1'));
     put_be32(pb, ffm->packet_size);
     /* XXX: store write position in other file ? */
     put_be64(pb, ffm->packet_size); /* current write position */
@@ -480,6 +480,7 @@
         fst = av_mallocz(sizeof(FFMStream));
         if (!fst)
             goto fail;
+        s->streams[i] = st;
             
         av_set_pts_info(st, 64, 1, 1000000);
             
@@ -487,10 +488,10 @@
 
         codec = st->codec;
         /* generic info */
-        st->codec->codec_id = get_be32(pb);
-        st->codec->codec_type = get_byte(pb); /* codec_type */
+        codec->codec_id = get_be32(pb);
+        codec->codec_type = get_byte(pb); /* codec_type */
         codec->bit_rate = get_be32(pb);
-	st->quality = get_be32(pb);
+        st->quality = get_be32(pb);
         codec->flags = get_be32(pb);
         codec->flags2 = get_be32(pb);
         codec->debug = get_be32(pb);