Mercurial > libavformat.hg

diff utils.c @ 6071:72faba69143f libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the error message issued in case of invalid codec tag more informative.
author stefano
date Wed, 02 Jun 2010 10:54:53 +0000
parents f3000d7fad52
children 2f4b67897701
line wrap: on
line diff
--- a/utils.c	Tue Jun 01 20:00:26 2010 +0000
+++ b/utils.c	Wed Jun 02 10:54:53 2010 +0000
@@ -2656,9 +2656,11 @@
         if(s->oformat->codec_tag){
             if(st->codec->codec_tag){
                 if (!validate_codec_tag(s, st)) {
+                    char tagbuf[32];
+                    av_get_codec_tag_string(tagbuf, sizeof(tagbuf), st->codec->codec_tag);
                     av_log(s, AV_LOG_ERROR,
-                           "Tag 0x%08x incompatible with output codec\n",
-                           st->codec->codec_tag);
+                           "Tag %s/0x%08x incompatible with output codec '%s'\n",
+                           tagbuf, st->codec->codec_tag, st->codec->codec->name);
                     return AVERROR_INVALIDDATA;
                 }
             }else