Commit e5397513 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '8fc11abe'

* commit '8fc11abe':
  mkv: Print unsupported mov tags when found

Conflicts:
	libavformat/matroskadec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4b28907e 8fc11abe
...@@ -1797,6 +1797,12 @@ static int matroska_parse_tracks(AVFormatContext *s) ...@@ -1797,6 +1797,12 @@ static int matroska_parse_tracks(AVFormatContext *s)
} }
if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI ")) if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI "))
codec_id = AV_CODEC_ID_SVQ3; codec_id = AV_CODEC_ID_SVQ3;
if (codec_id == AV_CODEC_ID_NONE) {
char buf[32];
av_get_codec_tag_string(buf, sizeof(buf), fourcc);
av_log(matroska->ctx, AV_LOG_ERROR,
"mov FourCC not found %s.\n", buf);
}
} else if (codec_id == AV_CODEC_ID_PCM_S16BE) { } else if (codec_id == AV_CODEC_ID_PCM_S16BE) {
switch (track->audio.bitdepth) { switch (track->audio.bitdepth) {
case 8: case 8:
......
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