[FFmpeg-cvslog] r23423 - trunk/libavformat/utils.c

[stefano]

Author: stefano
Date: Wed Jun  2 12:54:53 2010
New Revision: 23423

Log:
Make the error message issued in case of invalid codec tag more
informative.

Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Wed Jun  2 12:54:50 2010	(r23422)
+++ trunk/libavformat/utils.c	Wed Jun  2 12:54:53 2010	(r23423)
@@ -2656,9 +2656,11 @@ int av_write_header(AVFormatContext *s)
         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