aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-20 13:59:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-20 13:59:53 +0200
commitbf52ad1e49d3e62eed5b1282f54cd331082a086e (patch)
treeeabb949041b0c02bf9802d14d33eb7452df18275
parent6912e7a008acd1464a63b0a00779a3de81b9a8ab (diff)
downloadffmpeg-bf52ad1e49d3e62eed5b1282f54cd331082a086e.tar.gz
lavc: revert broken hunk from 1cd9c81ddb317ca00061d11d3562d3a34888d91b
This should fix fate failures Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d54c224684..e4b3ed71c6 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -888,10 +888,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
if (codec->capabilities & CODEC_CAP_EXPERIMENTAL)
if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
- av_log(avctx, AV_LOG_ERROR,
- "Codec %s is experimental but experimental codecs are not enabled: "
- "try the \"strict\" option with value \"experimental\"\n",
- avctx->codec->name);
+ av_log(avctx, AV_LOG_ERROR, "Codec is experimental but experimental codecs are not enabled, try -strict -2\n");
ret = -1;
goto free_and_end;
}