[SCM] libav/experimental: Fix segv when stream copy and validate_tag fails, st->codec->codec is not set

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d2064fd42b2dd1cf1c44e5c4fc4b8aaba6698637
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Aug 12 00:35:19 2010 +0000

    Fix segv when stream copy and validate_tag fails, st->codec->codec is not set
    
    Originally committed as revision 24782 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index fb0554b..8853a65 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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

-- 
Libav/FFmpeg packaging