diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-07 14:18:43 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-07 14:18:43 +0000 |
| commit | 5997ed786a0d67fc4357aaef3437fa29614c3e29 (patch) | |
| tree | d1d7d1ae81f910bec298547a67cb194e59731833 /libavformat | |
| parent | 80f05e7981a2ed7d22bd2ef57d0063191edd432b (diff) | |
| download | ffmpeg-5997ed786a0d67fc4357aaef3437fa29614c3e29.tar.gz | |
only set fields for mov, reserved for 3gp, mp4
Originally committed as revision 5949 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 1471c6648d..1d019ce40d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -605,6 +605,7 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track) put_be16(pb, 0); /* Codec stream version */ put_be16(pb, 0); /* Codec stream revision (=0) */ + if (track->mode == MODE_MOV) { put_tag(pb, "FFMP"); /* Vendor */ if(track->enc->codec_id == CODEC_ID_RAWVIDEO) { put_be32(pb, 0); /* Temporal Quality */ @@ -613,6 +614,11 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track) put_be32(pb, 0x200); /* Temporal Quality = normal */ put_be32(pb, 0x200); /* Spatial Quality = normal */ } + } else { + put_be32(pb, 0); /* Reserved */ + put_be32(pb, 0); /* Reserved */ + put_be32(pb, 0); /* Reserved */ + } put_be16(pb, track->enc->width); /* Video width */ put_be16(pb, track->enc->height); /* Video height */ put_be32(pb, 0x00480000); /* Horizontal resolution 72dpi */ @@ -621,7 +627,8 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track) put_be16(pb, 1); /* Frame count (= 1) */ memset(compressor_name,0,32); - if (track->enc->codec && track->enc->codec->name) + /* FIXME not sure, ISO 14496-1 draft where it shall be set to 0 */ + if (track->mode == MODE_MOV && track->enc->codec && track->enc->codec->name) strncpy(compressor_name,track->enc->codec->name,31); put_byte(pb, strlen(compressor_name)); put_buffer(pb, compressor_name, 31); |