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

[bcoudurier]

Author: bcoudurier
Date: Thu Aug 12 02:35:19 2010
New Revision: 24782

Log:
Fix segv when stream copy and validate_tag fails, st->codec->codec is not set

Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Thu Aug 12 02:33:18 2010	(r24781)
+++ trunk/libavformat/utils.c	Thu Aug 12 02:35:19 2010	(r24782)
@@ -2699,8 +2699,8 @@ int av_write_header(AVFormatContext *s)
                     char tagbuf[32];
                     av_get_codec_tag_string(tagbuf, sizeof(tagbuf), st->codec->codec_tag);
                     av_log(s, AV_LOG_ERROR,
-                           "Tag %s/0x%08x incompatible with output codec '%s'\n",
-                           tagbuf, st->codec->codec_tag, st->codec->codec->name);
+                           "Tag %s/0x%08x incompatible with output codec id '%d'\n",
+                           tagbuf, st->codec->codec_tag, st->codec->codec_id);
                     return AVERROR_INVALIDDATA;
                 }
             }else