Originally committed as revision 23423 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -2656,9 +2656,11 @@ int av_write_header(AVFormatContext *s) · 2655 unmodified lines | |||
| 2656 | if(s->oformat->codec_tag){ | 2656 | if(s->oformat->codec_tag){ |
| 2657 | if(st->codec->codec_tag){ | 2657 | if(st->codec->codec_tag){ |
| 2658 | if (!validate_codec_tag(s, st)) { | 2658 | if (!validate_codec_tag(s, st)) { |
| 2659 | char tagbuf[32]; | ||
| 2660 | av_get_codec_tag_string(tagbuf, sizeof(tagbuf), st->codec->codec_tag); | ||
| 2659 | av_log(s, AV_LOG_ERROR, | 2661 | av_log(s, AV_LOG_ERROR, |
| 2660 | "Tag 0x%08x incompatible with output codec\n", | 2662 | "Tag %s/0x%08x incompatible with output codec '%s'\n", |
| 2661 | st->codec->codec_tag); | 2663 | tagbuf, st->codec->codec_tag, st->codec->codec->name); |
| 2662 | return AVERROR_INVALIDDATA; | 2664 | return AVERROR_INVALIDDATA; |
| 2663 | } | 2665 | } |
| 2664 | }else | 2666 | }else |