xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-29 22:40:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Write wav header if there is no native audio codec ID

Browse Source 
Originally committed as revision 10321 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2007-09-05 00:23:29 +00:00
parent 6364d534ea
commit 1a302a5c2a
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/matroskaenc.c
View File

@ -421,7 +421,20 @@ static int mkv_write_tracks(AVFormatContext *s)
case CODEC_TYPE_AUDIO:
put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
// XXX: A_MS/ACM
if (!native_id) {
offset_t wav_header;
// no mkv-specific ID, use ACM mode
codec->codec_tag = codec_get_tag(codec_wav_tags, codec->codec_id);
if (!codec->codec_tag) {
av_log(s, AV_LOG_ERROR, "no codec id found for stream %d", i);
return -1;
}
put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_AUDIO_ACM);
wav_header = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE);
put_wav_header(pb, codec);
end_ebml_master(pb, wav_header);
}
subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO);
put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , codec->channels);
put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, codec->sample_rate);