diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:04:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:04:02 +0200 |
| commit | e5397513b93d356ffec8e401e18cb8e8d89e2077 (patch) | |
| tree | 5d46d32e4520673d04dd5f2beb88519e7639bfd7 /libavformat/matroskadec.c | |
| parent | 4b28907e4a947b7697fa44d5a80b6675ab152cc0 (diff) | |
| parent | 8fc11abe1fea4f211cc7dbd58a173d1221627d90 (diff) | |
| download | ffmpeg-e5397513b93d356ffec8e401e18cb8e8d89e2077.tar.gz | |
Merge commit '8fc11abe1fea4f211cc7dbd58a173d1221627d90'
* commit '8fc11abe1fea4f211cc7dbd58a173d1221627d90':
mkv: Print unsupported mov tags when found
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6141d38c95..16063412de 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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 ")) 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) { switch (track->audio.bitdepth) { case 8: |