diff options
| -rw-r--r-- | libavformat/movenc.c | 11 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 86d65b9c39..cc809b649f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -255,6 +255,10 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track) put_tag(pb, "mp4a"); else if(track->enc->codec_id == CODEC_ID_AMR_NB) put_tag(pb, "samr"); + else if(track->enc->codec_id == CODEC_ID_PCM_S16BE) + put_tag(pb, "twos"); + else if(track->enc->codec_id == CODEC_ID_PCM_S16LE) + put_tag(pb, "sowt"); else put_tag(pb, " "); @@ -432,6 +436,8 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track) put_tag(pb, "mp4v"); else if(track->enc->codec_id == CODEC_ID_H263) put_tag(pb, "s263"); + else if(track->enc->codec_id == CODEC_ID_DVVIDEO) + put_tag(pb, "dvc "); else put_tag(pb, " "); /* Unknown tag */ @@ -577,7 +583,10 @@ static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track) put_be32(pb, 0); /* size */ put_tag(pb, "hdlr"); put_be32(pb, 0); /* Version & flags */ - put_be32(pb, 0); /* reserved */ + if (track->mode == MODE_MOV) + put_tag(pb, "mhlr"); /* handler */ + else + put_be32(pb, 0); /* reserved */ if(track->enc->codec_type == CODEC_TYPE_VIDEO) put_tag(pb, "vide"); /* handler type */ else diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index e5eed91936..f5ff870f63 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -19,7 +19,7 @@ f13889dd08a4968e2b783771c7a29229 *./data/b-libav.ffm 9d1a1e4d23f16ecee9ad46f913acbbe0 *./data/b-libav.flv 336334 ./data/b-libav.flv ./data/b-libav.flv CRC=8a731c32 -2759fdd5f1014abfefe36376649c9c90 *./data/b-libav.mov +a2e76e8d1cbc2ccd292697677c04f722 *./data/b-libav.mov 365253 ./data/b-libav.mov ./data/b-libav.mov CRC=1bd6add1 fb191b2d08006f875c59940ec25abf10 *./data/b-libav.nut |