diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-08-12 00:35:19 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-08-12 00:35:19 +0000 |
| commit | d2064fd42b2dd1cf1c44e5c4fc4b8aaba6698637 (patch) | |
| tree | d096b571cc24ab681163bf88f3f1f998bfcc7207 /libavformat | |
| parent | e4cc9f208d2c79ea9fed3bbb46bfaf73749c8271 (diff) | |
| download | ffmpeg-d2064fd42b2dd1cf1c44e5c4fc4b8aaba6698637.tar.gz | |
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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index fb0554b98a..8853a650cb 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 |