Michael Niedermayer
13 years ago
1 changed files with 3 additions and 4 deletions
Unified View
Diff Options
-
+3 -4libavcodec/4xm.c
+ 3
- 4
libavcodec/4xm.c
View File
| @@ -30,8 +30,7 @@ | |||||
| #include "dsputil.h" | #include "dsputil.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| //#undef NDEBUG | |||||
| //#include <assert.h> | |||||
| #include "libavutil/avassert.h" | |||||
| #define BLOCK_TYPE_VLC_BITS 5 | #define BLOCK_TYPE_VLC_BITS 5 | ||||
| #define ACDC_VLC_BITS 9 | #define ACDC_VLC_BITS 9 | ||||
| @@ -328,7 +327,7 @@ static inline void mcdc(uint16_t *dst, const uint16_t *src, int log2w, | |||||
| } | } | ||||
| break; | break; | ||||
| default: | 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 *start = (uint16_t *)f->last_picture.data[0]; | ||||
| uint16_t *end = start + stride * (f->avctx->height - h + 1) - (1 << log2w); | 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 (code == 0) { | ||||
| if (f->g.buffer_end - f->g.buffer < 1) { | if (f->g.buffer_end - f->g.buffer < 1) { | ||||