diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-19 03:04:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-19 04:07:26 +0100 |
| commit | 7fbe87c079d3b6b2da21942b9fe4c133f8ad6e66 (patch) | |
| tree | 341f7a22fe6a6dccf2e4f4939fd5b6738489e8b6 /libavcodec | |
| parent | 85ab33b87f157b3170678f84041634775601838b (diff) | |
| download | ffmpeg-7fbe87c079d3b6b2da21942b9fe4c133f8ad6e66.tar.gz | |
lavc: remove incorrect mapping between semantically incompatible error recognization values and flags.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ba85129688..82a888c4a7 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; |