diff options
| author | bubu <bubu@bubu.net> | 2003-01-01 15:10:45 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-01-01 15:10:45 +0000 |
| commit | ccfddafbd9a775b05faeaf2f5a5ed182951419aa (patch) | |
| tree | 787d7625d6b2f861a7512583effd4afc8fff3775 /libavcodec | |
| parent | 7204b806a0f62401bc66e137f475e896dc3e4dfa (diff) | |
| download | ffmpeg-ccfddafbd9a775b05faeaf2f5a5ed182951419aa.tar.gz | |
warnings patch by (bubu <bubu at bubu dot net>)
Originally committed as revision 1386 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dv.c | 1 | ||||
| -rw-r--r-- | libavcodec/i386/mpegvideo_mmx.c | 1 | ||||
| -rw-r--r-- | libavcodec/mjpeg.c | 5 | ||||
| -rw-r--r-- | libavcodec/ratecontrol.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index fe0e5ec5d2..f436caf128 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -497,7 +497,6 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, { DVVideoDecodeContext *s = avctx->priv_data; int sct, dsf, apt, ds, nb_dif_segs, vs, width, height, i, packet_size; - unsigned size; UINT8 *buf_ptr; const UINT16 *mb_pos_ptr; diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c index cb7af3e62e..d936abfd5d 100644 --- a/libavcodec/i386/mpegvideo_mmx.c +++ b/libavcodec/i386/mpegvideo_mmx.c @@ -529,7 +529,6 @@ static void ff_libmpeg2mmx2_idct_add(UINT8 *dest, int line_size, DCTELEM *block) void MPV_common_init_mmx(MpegEncContext *s) { if (mm_flags & MM_MMX) { - int i; const int dct_algo = s->avctx->dct_algo; const int idct_algo= s->avctx->idct_algo; diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 47ace7bc38..9b49435825 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -1182,8 +1182,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) get_bits(&s->gb, 8), get_bits(&s->gb, 8)); 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, (float)x_density, y_density, (float)y_density); diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 6be99cc4d0..3593c68bf6 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -446,11 +446,13 @@ static double predict_size(Predictor *p, double q, double var) return p->coeff*var / (q*p->count); } +/* 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); return p->coeff*var / (size*p->count); } +*/ 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); double rate_factor=0; double step; - int last_i_frame=-10000000; + //int last_i_frame=-10000000; const int filter_size= (int)(s->qblur*4) | 1; double expected_bits; double *qscale, *blured_qscale; |