From 5cad192d5011f9819ae3ba3a9fc75aa8ae629ba4 Mon Sep 17 00:00:00 2001 From: Nico Sabbi Date: Mon, 30 May 2005 17:32:02 +0000 Subject: according to the standard the object_type for H264 is 33, not 241 Originally committed as revision 4323 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/movenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 58660e4836..20a94216d6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -79,7 +79,7 @@ const CodecTag ff_mov_obj_type[] = { { 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 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic // 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 -- cgit v1.2.3