Mercurial > libavformat.hg
comparison movenc.c @ 791:f961db8ea65d libavformat
This trivial patch adds "avc1" as fourcc for h264 in mp4, which makes it
a little bit more standard, although it still seems to lack some
metadata. Anyway, recent mplayer plays these streams without problems.
It also has two globally scoped global structs changed to "static".
patch by (Erik Slagter <erik slagter name)
| author | michael |
|---|---|
| date | Sun, 19 Jun 2005 23:45:54 +0000 |
| parents | 5697cc32e295 |
| children | e446442b0851 |
comparison
equal
deleted
inserted
replaced
| 790:80aec794c2ed | 791:f961db8ea65d |
|---|---|
| 257 put_be32(pb, 0); /* null tag */ | 257 put_be32(pb, 0); /* null tag */ |
| 258 | 258 |
| 259 return updateSize (pb, pos); | 259 return updateSize (pb, pos); |
| 260 } | 260 } |
| 261 | 261 |
| 262 const CodecTag codec_movaudio_tags[] = { | 262 static const CodecTag codec_movaudio_tags[] = { |
| 263 { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, | 263 { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, |
| 264 { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, | 264 { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, |
| 265 { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, | 265 { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, |
| 266 { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, | 266 { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, |
| 267 { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, | 267 { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, |
| 489 putDescr(pb, 0x06, 1); | 489 putDescr(pb, 0x06, 1); |
| 490 put_byte(pb, 0x02); | 490 put_byte(pb, 0x02); |
| 491 return updateSize (pb, pos); | 491 return updateSize (pb, pos); |
| 492 } | 492 } |
| 493 | 493 |
| 494 const CodecTag codec_movvideo_tags[] = { | 494 static const CodecTag codec_movvideo_tags[] = { |
| 495 { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, | 495 { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, |
| 496 { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, | 496 { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, |
| 497 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, | 497 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, |
| 498 { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, | 498 { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, |
| 499 { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, | |
| 499 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, | 500 { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, |
| 500 { 0, 0 }, | 501 { 0, 0 }, |
| 501 }; | 502 }; |
| 502 | 503 |
| 503 static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track) | 504 static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track) |