Commit 9dd633c2 authored by nicodvb's avatar nicodvb

according to the standard the object_type for H264 is 33, not 241


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4323 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5bc3fd86
...@@ -79,7 +79,7 @@ const CodecTag ff_mov_obj_type[] = { ...@@ -79,7 +79,7 @@ const CodecTag ff_mov_obj_type[] = {
{ CODEC_ID_MPEG2VIDEO, 96 },//mpeg2 profiles { CODEC_ID_MPEG2VIDEO, 96 },//mpeg2 profiles
{ CODEC_ID_MP2 , 107 },//FIXME mpeg2 mpeg audio -> 105 { CODEC_ID_MP2 , 107 },//FIXME mpeg2 mpeg audio -> 105
{ CODEC_ID_MP3 , 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_H263 , 242 },
{ CODEC_ID_H261 , 243 }, { CODEC_ID_H261 , 243 },
{ CODEC_ID_MJPEG , 108 }, { CODEC_ID_MJPEG , 108 },
...@@ -459,6 +459,8 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic ...@@ -459,6 +459,8 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
// Object type indication // Object type indication
put_byte(pb, codec_get_tag(ff_mov_obj_type, track->enc->codec_id)); 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) if(track->enc->codec_type == CODEC_TYPE_AUDIO)
put_byte(pb, 0x15); // flags (= Audiostream) put_byte(pb, 0x15); // flags (= Audiostream)
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment