diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:22:25 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:22:25 +0200 |
| commit | 5114c62902d3726b898df5628b1eaf98b4a87027 (patch) | |
| tree | 00eefe8d8813cbf3c10019ba363d04180962324a | |
| parent | da76175d681246b07d526a395552edc020f0f4d9 (diff) | |
| parent | eedbeb4c2737f28844157fae4bd87ed42a61bb1d (diff) | |
| download | ffmpeg-5114c62902d3726b898df5628b1eaf98b4a87027.tar.gz | |
Merge commit 'eedbeb4c2737f28844157fae4bd87ed42a61bb1d'
* commit 'eedbeb4c2737f28844157fae4bd87ed42a61bb1d':
msmpeg4: Remove some broken, commented-out cruft
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/msmpeg4dec.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 2f908770e3..eb56dc1584 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -762,35 +762,9 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, if(sign) level= -level; } -#if 0 // waste of time / this will detect very few errors - { - const int abs_level= FFABS(level); - const int run1= run - rl->max_run[last][abs_level] - run_diff; - if(abs_level<=MAX_LEVEL && run<=MAX_RUN){ - if(abs_level <= rl->max_level[last][run]){ - av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n"); - return DECODING_AC_LOST; - } - if(abs_level <= rl->max_level[last][run]*2){ - av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 1 encoding possible\n"); - return DECODING_AC_LOST; - } - if(run1>=0 && abs_level <= rl->max_level[last][run1]){ - av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 2 encoding possible\n"); - return DECODING_AC_LOST; - } - } - } -#endif //level = level * qmul + (level>0) * qadd - (level<=0) * qadd ; if (level>0) level= level * qmul + qadd; else level= level * qmul - qadd; -#if 0 // waste of time too :( - if(level>2048 || level<-2048){ - av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc\n"); - return DECODING_AC_LOST; - } -#endif i+= run + 1; if(last) i+=192; #ifdef ERROR_DETAILS |