[FFmpeg-cvslog] lavc: revert broken hunk from 1cd9c81ddb317ca00061d11d3562d3a34888d91b

Michael Niedermayer git at videolan.org
Sat Oct 20 14:05:56 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 20 13:59:53 2012 +0200| [bf52ad1e49d3e62eed5b1282f54cd331082a086e] | committer: Michael Niedermayer

lavc: revert broken hunk from 1cd9c81ddb317ca00061d11d3562d3a34888d91b

This should fix fate failures

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf52ad1e49d3e62eed5b1282f54cd331082a086e
---

 libavcodec/utils.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d54c224..e4b3ed7 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;
         }



More information about the ffmpeg-cvslog mailing list