mirror of https://git.ffmpeg.org/ffmpeg.git
* 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
This commit is contained in:
parent
046bee8620
commit
ca20f118d1
|
@ -255,6 +255,10 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
|
||||||
put_tag(pb, "mp4a");
|
put_tag(pb, "mp4a");
|
||||||
else if(track->enc->codec_id == CODEC_ID_AMR_NB)
|
else if(track->enc->codec_id == CODEC_ID_AMR_NB)
|
||||||
put_tag(pb, "samr");
|
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
|
else
|
||||||
put_tag(pb, " ");
|
put_tag(pb, " ");
|
||||||
|
|
||||||
|
@ -432,6 +436,8 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
|
||||||
put_tag(pb, "mp4v");
|
put_tag(pb, "mp4v");
|
||||||
else if(track->enc->codec_id == CODEC_ID_H263)
|
else if(track->enc->codec_id == CODEC_ID_H263)
|
||||||
put_tag(pb, "s263");
|
put_tag(pb, "s263");
|
||||||
|
else if(track->enc->codec_id == CODEC_ID_DVVIDEO)
|
||||||
|
put_tag(pb, "dvc ");
|
||||||
else
|
else
|
||||||
put_tag(pb, " "); /* Unknown tag */
|
put_tag(pb, " "); /* Unknown tag */
|
||||||
|
|
||||||
|
@ -577,6 +583,9 @@ static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack* track)
|
||||||
put_be32(pb, 0); /* size */
|
put_be32(pb, 0); /* size */
|
||||||
put_tag(pb, "hdlr");
|
put_tag(pb, "hdlr");
|
||||||
put_be32(pb, 0); /* Version & flags */
|
put_be32(pb, 0); /* Version & flags */
|
||||||
|
if (track->mode == MODE_MOV)
|
||||||
|
put_tag(pb, "mhlr"); /* handler */
|
||||||
|
else
|
||||||
put_be32(pb, 0); /* reserved */
|
put_be32(pb, 0); /* reserved */
|
||||||
if(track->enc->codec_type == CODEC_TYPE_VIDEO)
|
if(track->enc->codec_type == CODEC_TYPE_VIDEO)
|
||||||
put_tag(pb, "vide"); /* handler type */
|
put_tag(pb, "vide"); /* handler type */
|
||||||
|
|
|
@ -19,7 +19,7 @@ f13889dd08a4968e2b783771c7a29229 *./data/b-libav.ffm
|
||||||
9d1a1e4d23f16ecee9ad46f913acbbe0 *./data/b-libav.flv
|
9d1a1e4d23f16ecee9ad46f913acbbe0 *./data/b-libav.flv
|
||||||
336334 ./data/b-libav.flv
|
336334 ./data/b-libav.flv
|
||||||
./data/b-libav.flv CRC=8a731c32
|
./data/b-libav.flv CRC=8a731c32
|
||||||
2759fdd5f1014abfefe36376649c9c90 *./data/b-libav.mov
|
a2e76e8d1cbc2ccd292697677c04f722 *./data/b-libav.mov
|
||||||
365253 ./data/b-libav.mov
|
365253 ./data/b-libav.mov
|
||||||
./data/b-libav.mov CRC=1bd6add1
|
./data/b-libav.mov CRC=1bd6add1
|
||||||
fb191b2d08006f875c59940ec25abf10 *./data/b-libav.nut
|
fb191b2d08006f875c59940ec25abf10 *./data/b-libav.nut
|
||||||
|
|
Loading…
Reference in New Issue