# HG changeset patch # User michael # Date 1085508445 0 # Node ID 4225c131a2eb7b9b9872f3b351c9b78c65c0249b # Parent f796043935f3fbf13596bcc2b72a8a33d0628d45 warning fixes by (Michael Roitzsch ) diff -r f796043935f3 -r 4225c131a2eb libpostproc/postprocess.c --- a/libpostproc/postprocess.c Sun May 23 01:10:15 2004 +0000 +++ b/libpostproc/postprocess.c Tue May 25 18:07:25 2004 +0000 @@ -123,7 +123,7 @@ static uint8_t clip_table[3*256]; static uint8_t * const clip_tab= clip_table + 256; -static int verbose= 0; +static const int verbose= 0; static const int attribute_used deringThreshold= 20; diff -r f796043935f3 -r 4225c131a2eb libpostproc/postprocess_template.c --- a/libpostproc/postprocess_template.c Sun May 23 01:10:15 2004 +0000 +++ b/libpostproc/postprocess_template.c Tue May 25 18:07:25 2004 +0000 @@ -2789,7 +2789,7 @@ uint64_t * const yHistogram= c.yHistogram; uint8_t * const tempSrc= c.tempSrc; uint8_t * const tempDst= c.tempDst; - const int mbWidth= isColor ? (width+7)>>3 : (width+15)>>4; + //const int mbWidth= isColor ? (width+7)>>3 : (width+15)>>4; #ifdef HAVE_MMX for(i=0; i<57; i++){ diff -r f796043935f3 -r 4225c131a2eb mpegvideo.h --- a/mpegvideo.h Sun May 23 01:10:15 2004 +0000 +++ b/mpegvideo.h Tue May 25 18:07:25 2004 +0000 @@ -904,8 +904,9 @@ int ff_h263_resync(MpegEncContext *s); int ff_h263_get_gob_height(MpegEncContext *s); int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); -inline int ff_h263_round_chroma(int x); +int ff_h263_round_chroma(int x); void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code); +int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); /* rv10.c */ diff -r f796043935f3 -r 4225c131a2eb msmpeg4.c --- a/msmpeg4.c Sun May 23 01:10:15 2004 +0000 +++ b/msmpeg4.c Tue May 25 18:07:25 2004 +0000 @@ -656,21 +656,6 @@ #endif //CONFIG_ENCODERS -/* old ffmpeg msmpeg4v3 mode */ -static void ff_old_msmpeg4_dc_scale(MpegEncContext * s) -{ - if (s->qscale < 5){ - s->y_dc_scale = 8; - s->c_dc_scale = 8; - }else if (s->qscale < 9){ - s->y_dc_scale = 2 * s->qscale; - s->c_dc_scale = (s->qscale + 13)>>1; - }else{ - s->y_dc_scale = s->qscale + 8; - s->c_dc_scale = (s->qscale + 13)>>1; - } -} - static inline int msmpeg4v1_pred_dc(MpegEncContext * s, int n, int32_t **dc_val_ptr) { diff -r f796043935f3 -r 4225c131a2eb rv10.c --- a/rv10.c Sun May 23 01:10:15 2004 +0000 +++ b/rv10.c Tue May 25 18:07:25 2004 +0000 @@ -528,15 +528,9 @@ uint8_t *buf, int buf_size) { MpegEncContext *s = avctx->priv_data; - int i, mb_count, mb_pos, left; + int mb_count, mb_pos, left; init_get_bits(&s->gb, buf, buf_size*8); -#if 0 - for(i=0; igb)); - printf("\n"); - return 0; -#endif if(s->codec_id ==CODEC_ID_RV10) mb_count = rv10_decode_picture_header(s); else diff -r f796043935f3 -r 4225c131a2eb vp3.c --- a/vp3.c Sun May 23 01:10:15 2004 +0000 +++ b/vp3.c Tue May 25 18:07:25 2004 +0000 @@ -2056,7 +2056,7 @@ unsigned char *last_plane; unsigned char *golden_plane; int stride; - int motion_x, motion_y; + int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef; int upper_motion_limit, lower_motion_limit; int motion_halfpel_index; uint8_t *motion_source; diff -r f796043935f3 -r 4225c131a2eb wmv2.c --- a/wmv2.c Sun May 23 01:10:15 2004 +0000 +++ b/wmv2.c Tue May 25 18:07:25 2004 +0000 @@ -479,9 +479,6 @@ return 0; } -static void ff_wmv2_decode_init(MpegEncContext *s){ -} - static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){ MpegEncContext * const s= &w->s; int ret;