summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c9
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);