aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-11 23:24:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-11 23:26:55 +0200
commit5f298c679107c3607f6f54c1f38eeb1ba36900a9 (patch)
tree66b2875a62730b597243fc83a80fc7a1aa9582f5 /libavcodec
parente3c2d83183033c7b06ce9b0e1fc34e583f226fbe (diff)
downloadffmpeg-5f298c679107c3607f6f54c1f38eeb1ba36900a9.tar.gz
vorbisdec: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vorbisdec.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 133f14bd1a..4ddd978b12 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -31,6 +31,7 @@
#define BITSTREAM_READER_LE
#include "libavutil/float_dsp.h"
+#include "libavutil/avassert.h"
#include "avcodec.h"
#include "get_bits.h"
#include "dsputil.h"
@@ -45,9 +46,6 @@
#define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20)
-#undef NDEBUG
-#include <assert.h>
-
typedef struct {
uint8_t dimensions;
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);
- 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) {
unsigned temp2;