Originally committed as revision 1386 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -497,7 +497,6 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, | |||||
{ | { | ||||
DVVideoDecodeContext *s = avctx->priv_data; | DVVideoDecodeContext *s = avctx->priv_data; | ||||
int sct, dsf, apt, ds, nb_dif_segs, vs, width, height, i, packet_size; | int sct, dsf, apt, ds, nb_dif_segs, vs, width, height, i, packet_size; | ||||
unsigned size; | |||||
UINT8 *buf_ptr; | UINT8 *buf_ptr; | ||||
const UINT16 *mb_pos_ptr; | const UINT16 *mb_pos_ptr; | ||||
@@ -529,7 +529,6 @@ static void ff_libmpeg2mmx2_idct_add(UINT8 *dest, int line_size, DCTELEM *block) | |||||
void MPV_common_init_mmx(MpegEncContext *s) | void MPV_common_init_mmx(MpegEncContext *s) | ||||
{ | { | ||||
if (mm_flags & MM_MMX) { | if (mm_flags & MM_MMX) { | ||||
int i; | |||||
const int dct_algo = s->avctx->dct_algo; | const int dct_algo = s->avctx->dct_algo; | ||||
const int idct_algo= s->avctx->idct_algo; | const int idct_algo= s->avctx->idct_algo; | ||||
@@ -1182,8 +1182,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) | |||||
get_bits(&s->gb, 8), get_bits(&s->gb, 8)); | get_bits(&s->gb, 8), get_bits(&s->gb, 8)); | ||||
if (get_bits(&s->gb, 8) == 0) | if (get_bits(&s->gb, 8) == 0) | ||||
{ | { | ||||
int x_density = get_bits(&s->gb, 16); | |||||
int y_density = get_bits(&s->gb, 16); | |||||
int x_density, y_density; | |||||
x_density = get_bits(&s->gb, 16); | |||||
y_density = get_bits(&s->gb, 16); | |||||
dprintf("x/y density: %d (%f), %d (%f)\n", x_density, | dprintf("x/y density: %d (%f), %d (%f)\n", x_density, | ||||
(float)x_density, y_density, (float)y_density); | (float)x_density, y_density, (float)y_density); | ||||
@@ -446,11 +446,13 @@ static double predict_size(Predictor *p, double q, double var) | |||||
return p->coeff*var / (q*p->count); | return p->coeff*var / (q*p->count); | ||||
} | } | ||||
/* | |||||
static double predict_qp(Predictor *p, double size, double var) | static double predict_qp(Predictor *p, double size, double var) | ||||
{ | { | ||||
//printf("coeff:%f, count:%f, var:%f, size:%f//\n", p->coeff, p->count, var, size); | //printf("coeff:%f, count:%f, var:%f, size:%f//\n", p->coeff, p->count, var, size); | ||||
return p->coeff*var / (size*p->count); | return p->coeff*var / (size*p->count); | ||||
} | } | ||||
*/ | |||||
static void update_predictor(Predictor *p, double q, double var, double size) | static void update_predictor(Predictor *p, double q, double var, double size) | ||||
{ | { | ||||
@@ -705,7 +707,7 @@ static int init_pass2(MpegEncContext *s) | |||||
uint64_t all_available_bits= (uint64_t)(s->bit_rate*(double)rcc->num_entries/fps); | uint64_t all_available_bits= (uint64_t)(s->bit_rate*(double)rcc->num_entries/fps); | ||||
double rate_factor=0; | double rate_factor=0; | ||||
double step; | double step; | ||||
int last_i_frame=-10000000; | |||||
//int last_i_frame=-10000000; | |||||
const int filter_size= (int)(s->qblur*4) | 1; | const int filter_size= (int)(s->qblur*4) | 1; | ||||
double expected_bits; | double expected_bits; | ||||
double *qscale, *blured_qscale; | double *qscale, *blured_qscale; | ||||