# HG changeset patch # User michael # Date 1109272130 0 # Node ID e25782262d7dfd0340638196c5477fabb26f0d2e # Parent d3885f927bc74b77d4274166d9b96cf2a22f4c4a kill warnings patch by (Måns Rullgård ) diff -r d3885f927bc7 -r e25782262d7d adx.c --- a/adx.c Thu Feb 24 16:39:03 2005 +0000 +++ b/adx.c Thu Feb 24 19:08:50 2005 +0000 @@ -314,6 +314,7 @@ return 0; } +#if 0 static void dump(unsigned char *buf,size_t len) { int i; @@ -324,6 +325,8 @@ } av_log(NULL, AV_LOG_ERROR, "\n"); } +#endif + static int adx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf0, int buf_size) diff -r d3885f927bc7 -r e25782262d7d avcodec.h --- a/avcodec.h Thu Feb 24 16:39:03 2005 +0000 +++ b/avcodec.h Thu Feb 24 19:08:50 2005 +0000 @@ -2201,6 +2201,8 @@ void avcodec_flush_buffers(AVCodecContext *avctx); +void avcodec_default_free_buffers(AVCodecContext *s); + /* misc usefull functions */ /** diff -r d3885f927bc7 -r e25782262d7d cabac.h --- a/cabac.h Thu Feb 24 16:39:03 2005 +0000 +++ b/cabac.h Thu Feb 24 19:08:50 2005 +0000 @@ -264,6 +264,7 @@ c->bytestream+= CABAC_BITS/8; } +#if 0 /* all use commented */ static void refill2(CABACContext *c){ int i, x; @@ -282,7 +283,7 @@ c->low += x<bytestream+= CABAC_BITS/8; } - +#endif static inline void renorm_cabac_decoder(CABACContext *c){ while(c->range < (0x200 << CABAC_BITS)){ @@ -303,7 +304,7 @@ static inline int get_cabac(CABACContext *c, uint8_t * const state){ int RangeLPS= c->lps_range[*state][c->range>>(CABAC_BITS+7)]<<(CABAC_BITS+1); - int bit, lps_mask; + int bit, lps_mask attribute_unused; c->range -= RangeLPS; #if 1 diff -r d3885f927bc7 -r e25782262d7d cljr.c --- a/cljr.c Thu Feb 24 16:39:03 2005 +0000 +++ b/cljr.c Thu Feb 24 19:08:50 2005 +0000 @@ -119,12 +119,14 @@ return 0; } +#if 0 static int encode_init(AVCodecContext *avctx){ common_init(avctx); return 0; } +#endif AVCodec cljr_decoder = { "cljr", diff -r d3885f927bc7 -r e25782262d7d common.h --- a/common.h Thu Feb 24 16:39:03 2005 +0000 +++ b/common.h Thu Feb 24 19:08:50 2005 +0000 @@ -85,6 +85,14 @@ #endif #endif +#ifndef attribute_unused +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define attribute_unused __attribute__((unused)) +#else +# define attribute_unused +#endif +#endif + #ifndef EMULATE_INTTYPES # include #else diff -r d3885f927bc7 -r e25782262d7d dsputil.c --- a/dsputil.c Thu Feb 24 16:39:03 2005 +0000 +++ b/dsputil.c Thu Feb 24 19:08:50 2005 +0000 @@ -31,6 +31,9 @@ #include "simple_idct.h" #include "faandct.h" +/* snow.c */ +void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, int decomposition_count); + uint8_t cropTbl[256 + 2 * MAX_NEG_CROP] = {0, }; uint32_t squareTbl[512] = {0, }; @@ -2378,7 +2381,7 @@ #define op_scale2(x) dst[x] = clip_uint8( (src[x]*weights + dst[x]*weightd + offset) >> (log2_denom+1)) #define H264_WEIGHT(W,H) \ static void weight_h264_pixels ## W ## x ## H ## _c(uint8_t *block, int stride, int log2_denom, int weight, int offset){ \ - int x, y; \ + int attribute_unused x, y; \ offset <<= log2_denom; \ if(log2_denom) offset += 1<<(log2_denom-1); \ for(y=0; y> 1; \ offset = ((offset << 1) + 1) << log2_denom; \ for(y=0; y INT_MAX) @@ -97,7 +99,10 @@ */ void *av_realloc(void *ptr, unsigned int size) { +#ifdef MEMALIGN_HACK int diff; +#endif + /* lets disallow possible ambiguous cases */ if(size > INT_MAX) return NULL; diff -r d3885f927bc7 -r e25782262d7d mjpeg.c --- a/mjpeg.c Thu Feb 24 16:39:03 2005 +0000 +++ b/mjpeg.c Thu Feb 24 19:08:50 2005 +0000 @@ -676,7 +676,7 @@ if(avctx->pix_fmt == PIX_FMT_RGBA32){ int x, y, i; const int linesize= p->linesize[0]; - uint16_t (*buffer)[4]= s->rd_scratchpad; + uint16_t (*buffer)[4]= (void *) s->rd_scratchpad; int left[3], top[3], topleft[3]; for(i=0; i<3; i++){ diff -r d3885f927bc7 -r e25782262d7d motion_est.c --- a/motion_est.c Thu Feb 24 16:39:03 2005 +0000 +++ b/motion_est.c Thu Feb 24 19:08:50 2005 +0000 @@ -317,6 +317,7 @@ *my_ptr = 16 * s->mb_y; } +#if 0 /* the use of these functions is inside #if 0 */ static int full_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, int range, int xmin, int ymin, int xmax, int ymax, uint8_t *ref_picture) @@ -537,7 +538,7 @@ *my_ptr = my; return dminy; } - +#endif /* 0 */ #define Z_THRESHOLD 256 @@ -730,7 +731,6 @@ int dmin_sum=0, mx4_sum=0, my4_sum=0; int same=1; const int stride= c->stride; - const int uvstride= c->uvstride; uint8_t *mv_penalty= c->current_mv_penalty; init_mv4_ref(c); @@ -881,7 +881,6 @@ uint8_t * const mv_penalty= c->current_mv_penalty; int same=1; const int stride= 2*s->linesize; - const int uvstride= 2*s->uvlinesize; int dmin_sum= 0; const int mot_stride= s->mb_stride; const int xy= s->mb_x + s->mb_y*mot_stride; diff -r d3885f927bc7 -r e25782262d7d motion_est_template.c --- a/motion_est_template.c Thu Feb 24 16:39:03 2005 +0000 +++ b/motion_est_template.c Thu Feb 24 19:08:50 2005 +0000 @@ -25,11 +25,11 @@ //lets hope gcc will remove the unused vars ...(gcc 3.2.2 seems to do it ...) #define LOAD_COMMON\ - uint32_t * const score_map= c->score_map;\ - const int xmin= c->xmin;\ - const int ymin= c->ymin;\ - const int xmax= c->xmax;\ - const int ymax= c->ymax;\ + uint32_t attribute_unused * const score_map= c->score_map;\ + const int attribute_unused xmin= c->xmin;\ + const int attribute_unused ymin= c->ymin;\ + const int attribute_unused xmax= c->xmax;\ + const int attribute_unused ymax= c->ymax;\ uint8_t *mv_penalty= c->current_mv_penalty;\ const int pred_x= c->pred_x;\ const int pred_y= c->pred_y;\ diff -r d3885f927bc7 -r e25782262d7d mp3lameaudio.c --- a/mp3lameaudio.c Thu Feb 24 16:39:03 2005 +0000 +++ b/mp3lameaudio.c Thu Feb 24 19:08:50 2005 +0000 @@ -132,7 +132,7 @@ unsigned char *frame, int buf_size, void *data) { Mp3AudioContext *s = avctx->priv_data; - int len, i; + int len; int lame_result; /* lame 3.91 dies on '1-channel interleaved' data */ diff -r d3885f927bc7 -r e25782262d7d mpegaudio.c --- a/mpegaudio.c Thu Feb 24 16:39:03 2005 +0000 +++ b/mpegaudio.c Thu Feb 24 19:08:50 2005 +0000 @@ -468,6 +468,7 @@ break; default: assert(0); //cant happen + code = 0; /* kill warning */ } #if 0 diff -r d3885f927bc7 -r e25782262d7d mpegaudiodec.c --- a/mpegaudiodec.c Thu Feb 24 16:39:03 2005 +0000 +++ b/mpegaudiodec.c Thu Feb 24 19:08:50 2005 +0000 @@ -257,11 +257,13 @@ static int dev_4_3_coefs[DEV_ORDER]; +#if 0 /* unused */ static int pow_mult3[3] = { POW_FIX(1.0), POW_FIX(1.25992104989487316476), POW_FIX(1.58740105196819947474), }; +#endif static void int_pow_init(void) { @@ -274,6 +276,7 @@ } } +#if 0 /* unused, remove? */ /* return the mantissa and the binary exponent */ static int int_pow(int i, int *exp_ptr) { @@ -318,6 +321,7 @@ *exp_ptr = eq; return a; } +#endif static int decode_init(AVCodecContext * avctx) { diff -r d3885f927bc7 -r e25782262d7d mpegvideo.c --- a/mpegvideo.c Thu Feb 24 16:39:03 2005 +0000 +++ b/mpegvideo.c Thu Feb 24 19:08:50 2005 +0000 @@ -1820,7 +1820,7 @@ for(i=0; i<4; i++){ int sx= mb_x*16 + 4 + 8*(i&1); int sy= mb_y*16 + 4 + 8*(i>>1); - int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << mv_sample_log2-1; + int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << (mv_sample_log2-1); int mx= (pict->motion_val[direction][xy][0]>>shift) + sx; int my= (pict->motion_val[direction][xy][1]>>shift) + sy; draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100); @@ -1830,7 +1830,7 @@ for(i=0; i<2; i++){ int sx=mb_x*16 + 8; int sy=mb_y*16 + 4 + 8*i; - int xy= (mb_x*2 + (mb_y*2 + i)*mv_stride) << mv_sample_log2-1; + int xy= (mb_x*2 + (mb_y*2 + i)*mv_stride) << (mv_sample_log2-1); int mx=(pict->motion_val[direction][xy][0]>>shift); int my=(pict->motion_val[direction][xy][1]>>shift); @@ -1844,7 +1844,7 @@ for(i=0; i<2; i++){ int sx=mb_x*16 + 4 + 8*i; int sy=mb_y*16 + 8; - int xy= (mb_x*2 + i + mb_y*2*mv_stride) << mv_sample_log2-1; + int xy= (mb_x*2 + i + mb_y*2*mv_stride) << (mv_sample_log2-1); int mx=(pict->motion_val[direction][xy][0]>>shift); int my=(pict->motion_val[direction][xy][1]>>shift); @@ -2077,7 +2077,6 @@ int x, y, plane; int score=0; int64_t score64=0; - int64_t threshold; for(plane=0; plane<3; plane++){ const int stride= p->linesize[plane]; diff -r d3885f927bc7 -r e25782262d7d parser.c --- a/parser.c Thu Feb 24 16:39:03 2005 +0000 +++ b/parser.c Thu Feb 24 19:08:50 2005 +0000 @@ -504,6 +504,7 @@ #define MPA_HEADER_SIZE 4 /* header + layer + bitrate + freq + lsf/mpeg25 */ +#undef SAME_HEADER_MASK /* mpegaudio.h defines different version */ #define SAME_HEADER_MASK \ (0xffe00000 | (3 << 17) | (3 << 10) | (3 << 19)) diff -r d3885f927bc7 -r e25782262d7d rangecoder.c --- a/rangecoder.c Thu Feb 24 16:39:03 2005 +0000 +++ b/rangecoder.c Thu Feb 24 19:08:50 2005 +0000 @@ -58,7 +58,7 @@ void ff_build_rac_states(RangeCoder *c, int factor, int max_p){ const int64_t one= 1LL<<32; int64_t p; - int last_p8, p8, i, j; + int last_p8, p8, i; memset(c->zero_state, 0, sizeof(c->zero_state)); memset(c-> one_state, 0, sizeof(c-> one_state)); diff -r d3885f927bc7 -r e25782262d7d rangecoder.h --- a/rangecoder.h Thu Feb 24 16:39:03 2005 +0000 +++ b/rangecoder.h Thu Feb 24 19:08:50 2005 +0000 @@ -94,7 +94,7 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){ int range1= (c->range * (*state)) >> 8; - int one_mask; + int attribute_unused one_mask; c->range -= range1; #if 1 diff -r d3885f927bc7 -r e25782262d7d resample.c --- a/resample.c Thu Feb 24 16:39:03 2005 +0000 +++ b/resample.c Thu Feb 24 19:08:50 2005 +0000 @@ -128,7 +128,6 @@ int output_rate, int input_rate) { ReSampleContext *s; - int i; if ( input_channels > 2) { diff -r d3885f927bc7 -r e25782262d7d rv10.c --- a/rv10.c Thu Feb 24 16:39:03 2005 +0000 +++ b/rv10.c Thu Feb 24 19:08:50 2005 +0000 @@ -287,6 +287,7 @@ } } +#if 0 /* unused, remove? */ static int get_num(GetBitContext *gb) { int n, n1; @@ -299,6 +300,7 @@ return (n << 16) | n1; } } +#endif #endif //CONFIG_ENCODERS diff -r d3885f927bc7 -r e25782262d7d sonic.c --- a/sonic.c Thu Feb 24 16:39:03 2005 +0000 +++ b/sonic.c Thu Feb 24 19:08:50 2005 +0000 @@ -845,7 +845,7 @@ } static int sonic_decode_frame(AVCodecContext *avctx, - int16_t *data, int *data_size, + void *data, int *data_size, uint8_t *buf, int buf_size) { SonicContext *s = avctx->priv_data; diff -r d3885f927bc7 -r e25782262d7d svq1.c --- a/svq1.c Thu Feb 24 16:39:03 2005 +0000 +++ b/svq1.c Thu Feb 24 19:08:50 2005 +0000 @@ -600,6 +600,7 @@ return value; } +#if 0 /* unused, remove? */ static uint16_t svq1_component_checksum (uint16_t *pixels, int pitch, int width, int height, int value) { int x, y; @@ -614,6 +615,7 @@ return value; } +#endif static void svq1_parse_string (GetBitContext *bitbuf, uint8_t *out) { uint8_t seed; diff -r d3885f927bc7 -r e25782262d7d utils.c --- a/utils.c Thu Feb 24 16:39:03 2005 +0000 +++ b/utils.c Thu Feb 24 19:08:50 2005 +0000 @@ -677,18 +677,6 @@ return NULL; } -static AVCodec *avcodec_find(enum CodecID id) -{ - AVCodec *p; - p = first_avcodec; - while (p) { - if (p->id == id) - return p; - p = p->next; - } - return NULL; -} - void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) { const char *codec_name; diff -r d3885f927bc7 -r e25782262d7d vcr1.c --- a/vcr1.c Thu Feb 24 16:39:03 2005 +0000 +++ b/vcr1.c Thu Feb 24 19:08:50 2005 +0000 @@ -151,12 +151,14 @@ return 0; } +#if 0 static int encode_init(AVCodecContext *avctx){ common_init(avctx); return 0; } +#endif AVCodec vcr1_decoder = { "vcr1", diff -r d3885f927bc7 -r e25782262d7d wmv2.c --- a/wmv2.c Thu Feb 24 16:39:03 2005 +0000 +++ b/wmv2.c Thu Feb 24 19:08:50 2005 +0000 @@ -101,6 +101,7 @@ return 0; } +#if 0 /* unused, remove? */ static int wmv2_encode_end(AVCodecContext *avctx){ if(MPV_encode_end(avctx) < 0) @@ -111,6 +112,7 @@ return 0; } +#endif int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) {