Commit 0ec9ab14 authored by bcoudurier's avatar bcoudurier

fix aac in mov for ipod

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5498 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4382e1d3
...@@ -323,6 +323,10 @@ static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack* track) ...@@ -323,6 +323,10 @@ static int mov_write_wave_tag(ByteIOContext *pb, MOVTrack* track)
put_le32(pb, track->tag); put_le32(pb, track->tag);
if (track->enc->codec_id == CODEC_ID_AAC) { if (track->enc->codec_id == CODEC_ID_AAC) {
/* useless atom needed by mplayer, ipod, not needed by quicktime */
put_be32(pb, 12); /* size */
put_tag(pb, "mp4a");
put_be32(pb, 0);
mov_write_esds_tag(pb, track); mov_write_esds_tag(pb, track);
} else if (track->enc->codec_id == CODEC_ID_PCM_S24LE || } else if (track->enc->codec_id == CODEC_ID_PCM_S24LE ||
track->enc->codec_id == CODEC_ID_PCM_S32LE) { track->enc->codec_id == CODEC_ID_PCM_S32LE) {
...@@ -394,10 +398,14 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track) ...@@ -394,10 +398,14 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
if(version == 1) { if(version == 1) {
/* SoundDescription V1 extended info */ /* SoundDescription V1 extended info */
put_be32(pb, track->enc->frame_size); /* Samples per packet */ put_be32(pb, track->enc->frame_size); /* Samples per packet */
put_be32(pb, track->sampleDuration); /* Bytes per frame */ /* Parameters tested on quicktime 6.5, 7 */
put_be32(pb, 8); /* Bytes per sample */ put_be32(pb, 1); /* Bytes per packet */
put_be32(pb, 2); /* FIXME not correct */
/* 8 is the min value needed for in32 to work with quicktime 6.5 */
/* Value ignored by other codecs currently supported (others might need it) */
put_be32(pb, 8); /* Bytes per frame */
put_be32(pb, 2); /* Bytes per sample */
} }
if(track->mode == MODE_MOV && if(track->mode == MODE_MOV &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment