[FFmpeg-cvslog] lavc: remove incorrect mapping between semantically incompatible error recognization values and flags .

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 19 03:04:08 2011 +0100| [7fbe87c079d3b6b2da21942b9fe4c133f8ad6e66] | committer: Michael Niedermayer

lavc: remove incorrect mapping between semantically incompatible error recognization values and flags.

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

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

 libavcodec/utils.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ba85129..82a888c 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -616,9 +616,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD
 
     av_log(avctx, AV_LOG_DEBUG, "err{or,}_recognition separate: %d; %d\n",
            avctx->error_recognition, avctx->err_recognition);
-    /* FF_ER_CAREFUL (==1) implies AV_EF_CRCCHECK (== 1<<1 - 1),
-       FF_ER_COMPLIANT (==2) implies AV_EF_{CRCCHECK,BITSTREAM} (== 1<<2 - 1), et cetera} */
-    avctx->err_recognition |= (1<<(avctx->error_recognition-(avctx->error_recognition>=FF_ER_VERY_AGGRESSIVE))) - 1;
     switch(avctx->error_recognition){
         case FF_ER_VERY_AGGRESSIVE:
         case FF_ER_AGGRESSIVE     : avctx->err_recognition |= AV_EF_AGGRESSIVE;