diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2004-03-26 09:04:06 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2004-03-26 09:04:06 +0000 |
| commit | ca20f118d179509f5783150ac8cc3eb9e6dd44ac (patch) | |
| tree | a8906bc05a32aa9dea13eaa69d55c78a39cc183c /libavformat/movenc.c | |
| parent | 046bee8620a266b40f306fa9e96e4d56a5e1f477 (diff) | |
* enabling DV-in-QT
* fixing a bug in movenc.c: for QT files hdrl should contain 'mhlr'
Originally committed as revision 2928 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 11 |
1 files changed, 10 insertions, 1 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 |