Commit 6f1466dc authored by Mats Peterson's avatar Mats Peterson Committed by Michael Niedermayer

lavf/matroskadec: A_QUICKTIME and fourcc 0x00000000

In many older QuickTime files, the audio format, or "fourcc", is
0x00000000. The QuickTime File Format Specification states the following
regarding this situation:

"This format descriptor should not be used, but may be found in some
files. Samples are assumed to be stored in either 'raw ' or 'twos'
format, depending on the sample size field in the sound description."

MPlayer handles this logic by itself, but FFmpeg/FFplay currently does
not.
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 13d02d3d
...@@ -1869,6 +1869,15 @@ static int matroska_parse_tracks(AVFormatContext *s) ...@@ -1869,6 +1869,15 @@ static int matroska_parse_tracks(AVFormatContext *s)
fourcc = AV_RL32(track->codec_priv.data); fourcc = AV_RL32(track->codec_priv.data);
codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc); codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
} }
if (fourcc == 0) {
if (track->audio.bitdepth == 8) {
fourcc = MKTAG('r','a','w',' ');
codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
} else if (track->audio.bitdepth == 16) {
fourcc = MKTAG('t','w','o','s');
codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
}
}
} else if (!strcmp(track->codec_id, "V_QUICKTIME") && } else if (!strcmp(track->codec_id, "V_QUICKTIME") &&
(track->codec_priv.size >= 21) && (track->codec_priv.size >= 21) &&
(track->codec_priv.data)) { (track->codec_priv.data)) {
......
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