|
|
|
@ -30,8 +30,7 @@ |
|
|
|
|
#include "dsputil.h" |
|
|
|
|
#include "get_bits.h" |
|
|
|
|
|
|
|
|
|
//#undef NDEBUG
|
|
|
|
|
//#include <assert.h>
|
|
|
|
|
#include "libavutil/avassert.h" |
|
|
|
|
|
|
|
|
|
#define BLOCK_TYPE_VLC_BITS 5 |
|
|
|
|
#define ACDC_VLC_BITS 9 |
|
|
|
@ -328,7 +327,7 @@ static inline void mcdc(uint16_t *dst, const uint16_t *src, int log2w, |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|
default: |
|
|
|
|
assert(0); |
|
|
|
|
av_assert2(0); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -343,7 +342,7 @@ static void decode_p_block(FourXContext *f, uint16_t *dst, uint16_t *src, |
|
|
|
|
uint16_t *start = (uint16_t *)f->last_picture.data[0]; |
|
|
|
|
uint16_t *end = start + stride * (f->avctx->height - h + 1) - (1 << log2w); |
|
|
|
|
|
|
|
|
|
assert(code >= 0 && code <= 6); |
|
|
|
|
av_assert2(code >= 0 && code <= 6); |
|
|
|
|
|
|
|
|
|
if (code == 0) { |
|
|
|
|
if (f->g.buffer_end - f->g.buffer < 1) { |
|
|
|
|