mirror of https://git.ffmpeg.org/ffmpeg.git
asv1: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
b90f83e905
commit
da42f56985
|
@ -31,9 +31,6 @@
|
||||||
#include "dsputil.h"
|
#include "dsputil.h"
|
||||||
#include "mpeg12data.h"
|
#include "mpeg12data.h"
|
||||||
|
|
||||||
//#undef NDEBUG
|
|
||||||
//#include <assert.h>
|
|
||||||
|
|
||||||
#define VLC_BITS 6
|
#define VLC_BITS 6
|
||||||
#define ASV2_LEVEL_VLC_BITS 10
|
#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 + 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;
|
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]);
|
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]);
|
else put_bits(&a->pb, dc_ccp_tab[ccp][1], dc_ccp_tab[ccp][0]);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue