[Ffmpeg-cvslog] CVS: ffmpeg/libavformat movenc.c,1.39,1.40

[Nico Sabbi CVS]

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

Modified Files:
	movenc.c 
Log Message:
according to the standard the object_type for H264 is 33, not 241

Index: movenc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/movenc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- movenc.c	14 May 2005 19:48:32 -0000	1.39
+++ movenc.c	30 May 2005 17:32:02 -0000	1.40
@@ -79,7 +79,7 @@
     { CODEC_ID_MPEG2VIDEO,  96 },//mpeg2 profiles
     { CODEC_ID_MP2       , 107 },//FIXME mpeg2 mpeg audio -> 105
     { CODEC_ID_MP3       , 107 },//FIXME mpeg2 mpeg audio -> 105
-    { CODEC_ID_H264      , 241 },
+    { CODEC_ID_H264      ,  33 },
     { CODEC_ID_H263      , 242 },
     { CODEC_ID_H261      , 243 },
     { CODEC_ID_MJPEG     , 108 },
@@ -459,6 +459,8 @@
     // Object type indication
     put_byte(pb, codec_get_tag(ff_mov_obj_type, track->enc->codec_id));
 
+    // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)
+    // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
     if(track->enc->codec_type == CODEC_TYPE_AUDIO)
         put_byte(pb, 0x15);            // flags (= Audiostream)
     else