highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

movenv: fix remuxing of qdm2

Browse Source
This commit is contained in:
Piotr Bandurski 2012-08-06 00:37:28 +02:00 committed by Carl Eugen Hoyos
parent 1b72a7e8a9
commit 68f4156f44
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/movenc.c
View File

@ -407,9 +407,11 @@ static int mov_write_wave_tag(AVIOContext *pb, MOVTrack *track)
avio_wb32(pb, 0); /* size */ avio_wb32(pb, 0); /* size */
ffio_wfourcc(pb, "wave"); ffio_wfourcc(pb, "wave");
if (track->enc->codec_id != CODEC_ID_QDM2) {
avio_wb32(pb, 12); /* size */ avio_wb32(pb, 12); /* size */
ffio_wfourcc(pb, "frma"); ffio_wfourcc(pb, "frma");
avio_wl32(pb, track->tag); avio_wl32(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 */ /* useless atom needed by mplayer, ipod, not needed by quicktime */
@ -423,7 +425,8 @@ static int mov_write_wave_tag(AVIOContext *pb, MOVTrack *track)
mov_write_amr_tag(pb, track); mov_write_amr_tag(pb, track);
} else if (track->enc->codec_id == CODEC_ID_AC3) { } else if (track->enc->codec_id == CODEC_ID_AC3) {
mov_write_ac3_tag(pb, track); mov_write_ac3_tag(pb, track);
} else if (track->enc->codec_id == CODEC_ID_ALAC) { } else if (track->enc->codec_id == CODEC_ID_ALAC ||
track->enc->codec_id == CODEC_ID_QDM2) {
mov_write_extradata_tag(pb, track); mov_write_extradata_tag(pb, track);
} else if (track->enc->codec_id == CODEC_ID_ADPCM_MS || } else if (track->enc->codec_id == CODEC_ID_ADPCM_MS ||
track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) {
@ -614,7 +617,8 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track)
version = 2; version = 2;
} else if (track->audio_vbr || mov_pcm_le_gt16(track->enc->codec_id) || } else if (track->audio_vbr || mov_pcm_le_gt16(track->enc->codec_id) ||
track->enc->codec_id == CODEC_ID_ADPCM_MS || track->enc->codec_id == CODEC_ID_ADPCM_MS ||
track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV ||
track->enc->codec_id == CODEC_ID_QDM2) {
version = 1; version = 1;
} }
} }
@ -679,6 +683,7 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track)
track->enc->codec_id == CODEC_ID_ALAC || track->enc->codec_id == CODEC_ID_ALAC ||
track->enc->codec_id == CODEC_ID_ADPCM_MS || track->enc->codec_id == CODEC_ID_ADPCM_MS ||
track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || track->enc->codec_id == CODEC_ID_ADPCM_IMA_WAV ||
track->enc->codec_id == CODEC_ID_QDM2 ||
(mov_pcm_le_gt16(track->enc->codec_id) && version==1))) (mov_pcm_le_gt16(track->enc->codec_id) && version==1)))
mov_write_wave_tag(pb, track); mov_write_wave_tag(pb, track);
else if(track->tag == MKTAG('m','p','4','a')) else if(track->tag == MKTAG('m','p','4','a'))