[FFmpeg-cvslog] asv1: switch to av_assert
Michael Niedermayer
git at videolan.org
Mon Jun 18 22:03:38 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 18 21:44:22 2012 +0200| [da42f5698563cb22e927b499acae9513a38bdca2] | committer: Michael Niedermayer
asv1: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da42f5698563cb22e927b499acae9513a38bdca2
---
libavcodec/asv1.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 571af56..5c36459 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -31,9 +31,6 @@
#include "dsputil.h"
#include "mpeg12data.h"
-//#undef NDEBUG
-//#include <assert.h>
-
#define VLC_BITS 6
#define ASV2_LEVEL_VLC_BITS 10
@@ -294,7 +291,7 @@ static inline void asv2_encode_block(ASV1Context *a, DCTELEM block[64]){
if( (block[index + 1] = (block[index + 1]*a->q_intra_matrix[index + 1] + (1<<15))>>16) ) ccp |= 2;
if( (block[index + 9] = (block[index + 9]*a->q_intra_matrix[index + 9] + (1<<15))>>16) ) ccp |= 1;
- assert(i || ccp<8);
+ av_assert2(i || ccp<8);
if(i) put_bits(&a->pb, ac_ccp_tab[ccp][1], ac_ccp_tab[ccp][0]);
else put_bits(&a->pb, dc_ccp_tab[ccp][1], dc_ccp_tab[ccp][0]);
More information about the ffmpeg-cvslog
mailing list