diff options
| author | Dustin Brody <libav@parsoma.net> | 2011-07-27 20:44:58 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-08-01 21:06:48 +0200 |
| commit | 4326f6f525063e92d40e7a8f39cf7ccd7759aea7 (patch) | |
| tree | c605b6f43816b615dbfed4e05a07cf61d4efe6eb /libavcodec | |
| parent | a6c49f18abacb9bf52d4d808a2a56561a5b5445c (diff) | |
| download | ffmpeg-4326f6f525063e92d40e7a8f39cf7ccd7759aea7.tar.gz | |
mpeg4videodec: remove dead code that would have detected erroneous encoding
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 57d55a1424..0d061acfb9 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -990,28 +990,6 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, SKIP_COUNTER(re, &s->gb, 1+12+1); } -#if 0 - if(s->error_recognition >= FF_ER_COMPLIANT){ - const int abs_level= FFABS(level); - if(abs_level<=MAX_LEVEL && run<=MAX_RUN){ - const int run1= run - rl->max_run[last][abs_level] - 1; - if(abs_level <= rl->max_level[last][run]){ - av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n"); - return -1; - } - if(s->error_recognition > FF_ER_COMPLIANT){ - 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 -1; - } - 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 -1; - } - } - } - } -#endif if (level>0) level= level * qmul + qadd; else level= level * qmul - qadd; |