generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vorbisdec: switch to av_assert

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-11 23:24:23 +02:00
parent e3c2d83183
commit 5f298c6791
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vorbisdec.c
View File

@ -31,6 +31,7 @@
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/avassert.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "dsputil.h" #include "dsputil.h"
@ -45,9 +46,6 @@
#define V_MAX_VLCS (1 << 16) #define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20) #define V_MAX_PARTITIONS (1 << 20)
#undef NDEBUG
#include <assert.h>
typedef struct { typedef struct {
uint8_t dimensions; uint8_t dimensions;
uint8_t lookup_type; uint8_t lookup_type;
@ -1334,7 +1332,7 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
av_dlog(NULL, "Classword: %u\n", temp); av_dlog(NULL, "Classword: %u\n", temp);
assert(vr->classifications > 1 && temp <= 65536); //needed for inverse[] av_assert0(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
for (i = 0; i < c_p_c; ++i) { for (i = 0; i < c_p_c; ++i) {
unsigned temp2; unsigned temp2;