generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: print a matching tag in case of code tag validation failure

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-05-11 16:52:47 +02:00
parent 44391f706b
commit 30fc710556
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/utils.c
View File

@@ -3179,11 +3179,12 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
} }
if(st->codec->codec_tag){ if(st->codec->codec_tag){
if (!validate_codec_tag(s, st)) { if (!validate_codec_tag(s, st)) {
char tagbuf[32]; char tagbuf[32], cortag[32];
av_get_codec_tag_string(tagbuf, sizeof(tagbuf), st->codec->codec_tag); av_get_codec_tag_string(tagbuf, sizeof(tagbuf), st->codec->codec_tag);
av_get_codec_tag_string(cortag, sizeof(cortag), av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id));
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Tag %s/0x%08x incompatible with output codec id '%d'\n", "Tag %s/0x%08x incompatible with output codec id '%d' (%s)\n",
tagbuf, st->codec->codec_tag, st->codec->codec_id); tagbuf, st->codec->codec_tag, st->codec->codec_id, cortag);
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }