diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 02:23:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 03:04:44 +0100 |
| commit | 1bdc212a39312bd5914d643a4e664b4599477d8c (patch) | |
| tree | 19fcd489c7ec86908e240f1d6f6752d587dc97e7 /libavcodec/mpeg4videodec.c | |
| parent | 1a2484fc4e5c5effc32c55c2f25670ec23cbf57b (diff) | |
| parent | 0ea5b44275aa334528eb384a6548cc9f98c50a17 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: link test programs with static libraries
dct-test: remove unused variable cropTbl
swscale: fix overflow in gray16 vertical scaling.
get_bits: remove LAST_SKIP_CACHE macro
swscale: fix integer overflows in RGB pixel writing.
swscale: add endian conversion for RGB555 and RGB444 pixel formats
swscale: fix overflows in output of RGB48 pixels.
get_bits: remove strange/obsolete comments
get_bits: whitespace (mostly) cosmetics
swscale: add rgb565 endianess conversion
get_bits: remove unnecessary #includes
mp3dec: hack: fix decoding with safe bitstream reader
fate: fix eatqi test
adpcm: Check for channels to be a non-zero integer
swscale: fix overflows in RGB rounding constants.
get_bits: introduce safe bitreading to prevent overreads.
Conflicts:
libswscale/swscale.c
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 568b7f9be3..e620f75687 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -930,7 +930,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, }; SKIP_CACHE(re, &s->gb, 1); last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1); - run= SHOW_UBITS(re, &s->gb, 6); LAST_SKIP_CACHE(re, &s->gb, 6); + run= SHOW_UBITS(re, &s->gb, 6); SKIP_COUNTER(re, &s->gb, 1+1+6); UPDATE_CACHE(re, &s->gb); @@ -947,7 +947,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, }; SKIP_CACHE(re, &s->gb, 5); level= level * qmul + qadd; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); LAST_SKIP_CACHE(re, &s->gb, 1); + level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); SKIP_COUNTER(re, &s->gb, 1+11+5+1); i+= run + 1; @@ -964,7 +964,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, /* third escape */ SKIP_CACHE(re, &s->gb, 2); last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1); - run= SHOW_UBITS(re, &s->gb, 6); LAST_SKIP_CACHE(re, &s->gb, 6); + run= SHOW_UBITS(re, &s->gb, 6); SKIP_COUNTER(re, &s->gb, 2+1+6); UPDATE_CACHE(re, &s->gb); @@ -981,7 +981,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, if(SHOW_UBITS(re, &s->gb, 1)==0){ av_log(s->avctx, AV_LOG_ERROR, "2. marker bit missing in 3. esc\n"); return -1; - }; LAST_SKIP_CACHE(re, &s->gb, 1); + } SKIP_COUNTER(re, &s->gb, 1+12+1); } |