[FFmpeg-cvslog] vorbisdec: switch to av_assert
Michael Niedermayer
git at videolan.org
Wed Jul 11 23:36:18 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 11 23:24:23 2012 +0200| [5f298c679107c3607f6f54c1f38eeb1ba36900a9] | committer: Michael Niedermayer
vorbisdec: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f298c679107c3607f6f54c1f38eeb1ba36900a9
---
libavcodec/vorbisdec.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 133f14b..4ddd978 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;
More information about the ffmpeg-cvslog
mailing list