From 4df8ca9df2d960b9a112d60cdfd61d7f10f44cfa Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 25 May 2004 18:07:25 +0000 Subject: [PATCH] warning fixes by (Michael Roitzsch ) Originally committed as revision 3156 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/libpostproc/postprocess.c | 2 +- libavcodec/libpostproc/postprocess_template.c | 2 +- libavcodec/mpegvideo.h | 3 ++- libavcodec/msmpeg4.c | 15 --------------- libavcodec/rv10.c | 8 +------- libavcodec/vp3.c | 2 +- libavcodec/wmv2.c | 3 --- 7 files changed, 6 insertions(+), 29 deletions(-) diff --git a/libavcodec/libpostproc/postprocess.c b/libavcodec/libpostproc/postprocess.c index d4f6138f84..cf36599554 100644 --- a/libavcodec/libpostproc/postprocess.c +++ b/libavcodec/libpostproc/postprocess.c @@ -123,7 +123,7 @@ static uint64_t __attribute__((aligned(8))) attribute_used b80= 0x808080808080 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 --git a/libavcodec/libpostproc/postprocess_template.c b/libavcodec/libpostproc/postprocess_template.c index 7ebc08bd4a..9ffd2937f4 100644 --- a/libavcodec/libpostproc/postprocess_template.c +++ b/libavcodec/libpostproc/postprocess_template.c @@ -2789,7 +2789,7 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int 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 --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index bdd05403b6..715fb6d927 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -904,8 +904,9 @@ int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s); 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 --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 7e542a537c..7df276ca70 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -656,21 +656,6 @@ void msmpeg4_encode_mb(MpegEncContext * s, #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 --git a/libavcodec/rv10.c b/libavcodec/rv10.c index ade21db55e..58c5db7f44 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -528,15 +528,9 @@ static int rv10_decode_packet(AVCodecContext *avctx, 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 --git a/libavcodec/vp3.c b/libavcodec/vp3.c index e140ae3fdb..5b3f1b9260 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2056,7 +2056,7 @@ static void render_fragments(Vp3DecodeContext *s, 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 --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index a5ba1dd2da..13a112d1fb 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -479,9 +479,6 @@ s->picture_number++; //FIXME ? 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;