static int h263_decode_init(AVCodecContext *avctx)
{
MpegEncContext *s = avctx->priv_data;
-
+ int i;
+
s->out_format = FMT_H263;
s->width = avctx->width;
if (MPV_common_init(s) < 0)
return -1;
+ /* XXX: suppress this matrix init, only needed because using mpeg1
+ dequantize in mmx case */
+ for(i=0;i<64;i++)
+ s->non_intra_matrix[i] = default_non_intra_matrix[i];
+
if (s->h263_msmpeg4)
msmpeg4_decode_init_vlc(s);
else
/* default structure is frame */
s->picture_structure = PICT_FRAME;
- /* init default q matrix (only for mpeg and mjpeg) */
- for(i=0;i<64;i++) {
- s->intra_matrix[i] = default_intra_matrix[i];
- s->chroma_intra_matrix[i] = default_intra_matrix[i];
- s->non_intra_matrix[i] = default_non_intra_matrix[i];
- s->chroma_non_intra_matrix[i] = default_non_intra_matrix[i];
- }
/* init macroblock skip table */
if (!s->encoding) {
s->mbskip_table = av_mallocz(s->mb_width * s->mb_height);
int MPV_encode_init(AVCodecContext *avctx)
{
MpegEncContext *s = avctx->priv_data;
+ int i;
s->bit_rate = avctx->bit_rate;
s->frame_rate = avctx->frame_rate;
if (MPV_common_init(s) < 0)
return -1;
+ /* init default q matrix */
+ for(i=0;i<64;i++) {
+ s->intra_matrix[i] = default_intra_matrix[i];
+ s->non_intra_matrix[i] = default_non_intra_matrix[i];
+ }
+
/* rate control init */
rate_control_init(s);
static int rv10_decode_init(AVCodecContext *avctx)
{
MpegEncContext *s = avctx->priv_data;
+ int i;
static int done;
s->out_format = FMT_H263;
if (MPV_common_init(s) < 0)
return -1;
+ /* XXX: suppress this matrix init, only needed because using mpeg1
+ dequantize in mmx case */
+ for(i=0;i<64;i++)
+ s->non_intra_matrix[i] = default_non_intra_matrix[i];
+
h263_decode_init_vlc(s);
/* init rv vlc */