diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-04-24 13:59:39 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-04-24 13:59:39 +0000 |
| commit | 463e7afd18097e514d8e59ebe73c5b7684b3cfc6 (patch) | |
| tree | 446ecafebe98996ad8d8793184650bcf81b5cdbd /libavformat/movenc.c | |
| parent | be51192502938b8ad14dae72498829df705a1800 (diff) | |
| download | ffmpeg-463e7afd18097e514d8e59ebe73c5b7684b3cfc6.tar.gz | |
support for alac in .mov
Originally committed as revision 12938 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 738b97ff02..08070fca3b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -219,6 +219,16 @@ static int mov_write_amr_tag(ByteIOContext *pb, MOVTrack *track) return 0x11; } +/** + * This function writes extradata "as is". + * Extradata must be formated like a valid atom (with size and tag) + */ +static int mov_write_extradata_tag(ByteIOContext *pb, MOVTrack *track) +{ + put_buffer(pb, track->enc->extradata, track->enc->extradata_size); + return track->enc->extradata_size; +} + static int mov_write_enda_tag(ByteIOContext *pb) { put_be32(pb, 10); @@ -316,6 +326,8 @@ static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack* track) mov_write_enda_tag(pb); } else if (track->enc->codec_id == CODEC_ID_AMR_NB) { mov_write_amr_tag(pb, track); + } else if (track->enc->codec_id == CODEC_ID_ALAC) { + mov_write_extradata_tag(pb, track); } put_be32(pb, 8); /* size */ @@ -380,7 +392,8 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track) (track->enc->codec_id == CODEC_ID_AAC || track->enc->codec_id == CODEC_ID_AMR_NB || track->enc->codec_id == CODEC_ID_PCM_S24LE || - track->enc->codec_id == CODEC_ID_PCM_S32LE)) + track->enc->codec_id == CODEC_ID_PCM_S32LE || + track->enc->codec_id == CODEC_ID_ALAC)) mov_write_wave_tag(pb, track); else if(track->tag == MKTAG('m','p','4','a')) mov_write_esds_tag(pb, track); |