|
|
|
@ -895,6 +895,8 @@ static inline void mpeg4_encode_blocks(MpegEncContext * s, DCTELEM block[6][64], |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static const int dquant_code[5]= {1,0,9,2,3}; |
|
|
|
|
|
|
|
|
|
void mpeg4_encode_mb(MpegEncContext * s, |
|
|
|
|
DCTELEM block[6][64], |
|
|
|
|
int motion_x, int motion_y) |
|
|
|
@ -904,7 +906,6 @@ void mpeg4_encode_mb(MpegEncContext * s, |
|
|
|
|
PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=FF_B_TYPE ? &s->tex_pb : &s->pb; |
|
|
|
|
PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=FF_I_TYPE ? &s->pb2 : &s->pb; |
|
|
|
|
const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0; |
|
|
|
|
const int dquant_code[5]= {1,0,9,2,3}; |
|
|
|
|
|
|
|
|
|
// printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y);
|
|
|
|
|
if (!s->mb_intra) { |
|
|
|
@ -1268,7 +1269,6 @@ void h263_encode_mb(MpegEncContext * s, |
|
|
|
|
int16_t rec_intradc[6]; |
|
|
|
|
int16_t *dc_ptr[6]; |
|
|
|
|
const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1); |
|
|
|
|
const int dquant_code[5]= {1,0,9,2,3}; |
|
|
|
|
|
|
|
|
|
//printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y);
|
|
|
|
|
if (!s->mb_intra) { |
|
|
|
|