diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:23:38 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:23:38 +0200 |
commit | 2335e189fb7bcbee2eac6ec9a5756c29f6782a5b (patch) | |
tree | ff83417bbabfa7aadfc681f66425488765b8ccf1 /libavcodec | |
parent | 5114c62902d3726b898df5628b1eaf98b4a87027 (diff) | |
parent | 4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad (diff) |
Merge commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad'
* commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad':
msmpeg4: Remove commented-out debug logging code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/msmpeg4dec.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index eb56dc1584..77e8509f9d 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -638,7 +638,6 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) return level; } -//#define ERROR_DETAILS int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, int n, int coded, const uint8_t *scan_table) { @@ -767,12 +766,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, else level= level * qmul - qadd; i+= run + 1; if(last) i+=192; -#ifdef ERROR_DETAILS - if(run==66) - av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC3 level=%d\n", level); - else if((i>62 && i<192) || i>192+63) - av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC3 i=%d run=%d level=%d\n", i, run, level); -#endif } else { /* second escape */ SKIP_BITS(re, &s->gb, 2); @@ -780,12 +773,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, i+= run + rl->max_run[run>>7][level/qmul] + run_diff; //FIXME opt indexing level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); LAST_SKIP_BITS(re, &s->gb, 1); -#ifdef ERROR_DETAILS - if(run==66) - av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC2 level=%d\n", level); - else if((i>62 && i<192) || i>192+63) - av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC2 i=%d run=%d level=%d\n", i, run, level); -#endif } } else { /* first escape */ @@ -795,23 +782,11 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, level = level + rl->max_level[run>>7][(run-1)&63] * qmul;//FIXME opt indexing level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); LAST_SKIP_BITS(re, &s->gb, 1); -#ifdef ERROR_DETAILS - if(run==66) - av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC1 level=%d\n", level); - else if((i>62 && i<192) || i>192+63) - av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC1 i=%d run=%d level=%d\n", i, run, level); -#endif } } else { i+= run; level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); LAST_SKIP_BITS(re, &s->gb, 1); -#ifdef ERROR_DETAILS - if(run==66) - av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code level=%d\n", level); - else if((i>62 && i<192) || i>192+63) - av_log(s->avctx, AV_LOG_ERROR, "run overflow i=%d run=%d level=%d\n", i, run, level); -#endif } if (i > 62){ i-= 192; |