From 92afdd9267027f569dea2807d7057eaa2bbdb8c9 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Mon, 2 Dec 2002 21:58:56 +0000 Subject: update ffmpeg, pass fourcc and other stuff that might be useful CVS patchset: 3414 CVS date: 2002/12/02 21:58:56 --- src/libffmpeg/libavcodec/mpegvideo.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/libffmpeg/libavcodec/mpegvideo.c') diff --git a/src/libffmpeg/libavcodec/mpegvideo.c b/src/libffmpeg/libavcodec/mpegvideo.c index f1a94ccbe..b3565d3cc 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.c +++ b/src/libffmpeg/libavcodec/mpegvideo.c @@ -228,7 +228,7 @@ int DCT_common_init(MpegEncContext *s) MPV_common_init_mmi(s); #endif #ifdef ARCH_ARMV4L - MPV_common_init_armv4l(); + MPV_common_init_armv4l(s); #endif #ifdef ARCH_POWERPC MPV_common_init_ppc(s); @@ -557,12 +557,6 @@ int MPV_encode_init(AVCodecContext *avctx) s->qcompress= avctx->qcompress; s->qblur= avctx->qblur; s->avctx = avctx; - s->aspect_ratio_info= avctx->aspect_ratio_info; - if (avctx->aspect_ratio_info == FF_ASPECT_EXTENDED) - { - s->aspected_width = avctx->aspected_width; - s->aspected_height = avctx->aspected_height; - } s->flags= avctx->flags; s->max_b_frames= avctx->max_b_frames; s->b_frame_strategy= avctx->b_frame_strategy; @@ -825,6 +819,9 @@ int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) s->mb_skiped = 0; avctx->mbskip_table= s->mbskip_table; + s->hurry_up= s->avctx->hurry_up; + s->error_resilience= avctx->error_resilience; + if(avctx->flags&CODEC_FLAG_DR1){ if(avctx->get_buffer_callback(avctx, s->width, s->height, s->pict_type) < 0){ fprintf(stderr, "get_buffer() failed\n"); @@ -3080,7 +3077,8 @@ static int dct_quantize_c(MpegEncContext *s, *overflow= s->max_qcoeff < max; //overflow might have happend /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */ - ff_block_permute(block, s->idct_permutation, scantable, last_non_zero); + if (s->idct_permutation_type != FF_NO_IDCT_PERM) + ff_block_permute(block, s->idct_permutation, scantable, last_non_zero); return last_non_zero; } -- cgit v1.2.3