Commit 88730be6 authored by Måns Rullgård's avatar Måns Rullgård Committed by Michael Niedermayer
Browse files

kill warnings patch by (Måns Rullgård <mru inprovide com>)

Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 53513831
...@@ -3740,7 +3740,7 @@ void opt_intra_matrix(const char *arg) ...@@ -3740,7 +3740,7 @@ void opt_intra_matrix(const char *arg)
static void opt_target(const char *arg) static void opt_target(const char *arg)
{ {
int norm = -1; int norm = -1;
static const char const *frame_rates[] = {"25", "30000/1001", "24000/1001"}; static const char *const frame_rates[] = {"25", "30000/1001", "24000/1001"};
if(!strncmp(arg, "pal-", 4)) { if(!strncmp(arg, "pal-", 4)) {
norm = 0; norm = 0;
......
...@@ -314,6 +314,7 @@ static int adx_decode_init(AVCodecContext * avctx) ...@@ -314,6 +314,7 @@ static int adx_decode_init(AVCodecContext * avctx)
return 0; return 0;
} }
#if 0
static void dump(unsigned char *buf,size_t len) static void dump(unsigned char *buf,size_t len)
{ {
int i; int i;
...@@ -324,6 +325,8 @@ static void dump(unsigned char *buf,size_t len) ...@@ -324,6 +325,8 @@ static void dump(unsigned char *buf,size_t len)
} }
av_log(NULL, AV_LOG_ERROR, "\n"); av_log(NULL, AV_LOG_ERROR, "\n");
} }
#endif
static int adx_decode_frame(AVCodecContext *avctx, static int adx_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf0, int buf_size) uint8_t *buf0, int buf_size)
......
...@@ -2201,6 +2201,8 @@ void avcodec_register_all(void); ...@@ -2201,6 +2201,8 @@ void avcodec_register_all(void);
void avcodec_flush_buffers(AVCodecContext *avctx); void avcodec_flush_buffers(AVCodecContext *avctx);
void avcodec_default_free_buffers(AVCodecContext *s);
/* misc usefull functions */ /* misc usefull functions */
/** /**
......
...@@ -264,6 +264,7 @@ static void refill(CABACContext *c){ ...@@ -264,6 +264,7 @@ static void refill(CABACContext *c){
c->bytestream+= CABAC_BITS/8; c->bytestream+= CABAC_BITS/8;
} }
#if 0 /* all use commented */
static void refill2(CABACContext *c){ static void refill2(CABACContext *c){
int i, x; int i, x;
...@@ -282,7 +283,7 @@ static void refill2(CABACContext *c){ ...@@ -282,7 +283,7 @@ static void refill2(CABACContext *c){
c->low += x<<i; c->low += x<<i;
c->bytestream+= CABAC_BITS/8; c->bytestream+= CABAC_BITS/8;
} }
#endif
static inline void renorm_cabac_decoder(CABACContext *c){ static inline void renorm_cabac_decoder(CABACContext *c){
while(c->range < (0x200 << CABAC_BITS)){ while(c->range < (0x200 << CABAC_BITS)){
...@@ -303,7 +304,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ ...@@ -303,7 +304,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){
static inline int get_cabac(CABACContext *c, uint8_t * const state){ 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 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; c->range -= RangeLPS;
#if 1 #if 1
......
...@@ -119,12 +119,14 @@ static int decode_init(AVCodecContext *avctx){ ...@@ -119,12 +119,14 @@ static int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
#if 0
static int encode_init(AVCodecContext *avctx){ static int encode_init(AVCodecContext *avctx){
common_init(avctx); common_init(avctx);
return 0; return 0;
} }
#endif
AVCodec cljr_decoder = { AVCodec cljr_decoder = {
"cljr", "cljr",
......
...@@ -85,6 +85,14 @@ extern const struct AVOption avoptions_workaround_bug[11]; ...@@ -85,6 +85,14 @@ extern const struct AVOption avoptions_workaround_bug[11];
#endif #endif
#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 #ifndef EMULATE_INTTYPES
# include <inttypes.h> # include <inttypes.h>
#else #else
......
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
#include "simple_idct.h" #include "simple_idct.h"
#include "faandct.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, }; uint8_t cropTbl[256 + 2 * MAX_NEG_CROP] = {0, };
uint32_t squareTbl[512] = {0, }; uint32_t squareTbl[512] = {0, };
...@@ -2378,7 +2381,7 @@ H264_MC(avg_, 16) ...@@ -2378,7 +2381,7 @@ H264_MC(avg_, 16)
#define op_scale2(x) dst[x] = clip_uint8( (src[x]*weights + dst[x]*weightd + offset) >> (log2_denom+1)) #define op_scale2(x) dst[x] = clip_uint8( (src[x]*weights + dst[x]*weightd + offset) >> (log2_denom+1))
#define H264_WEIGHT(W,H) \ #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){ \ 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; \ offset <<= log2_denom; \
if(log2_denom) offset += 1<<(log2_denom-1); \ if(log2_denom) offset += 1<<(log2_denom-1); \
for(y=0; y<H; y++, block += stride){ \ for(y=0; y<H; y++, block += stride){ \
...@@ -2404,7 +2407,7 @@ static void weight_h264_pixels ## W ## x ## H ## _c(uint8_t *block, int stride, ...@@ -2404,7 +2407,7 @@ static void weight_h264_pixels ## W ## x ## H ## _c(uint8_t *block, int stride,
} \ } \
} \ } \
static void biweight_h264_pixels ## W ## x ## H ## _c(uint8_t *dst, uint8_t *src, int stride, int log2_denom, int weightd, int weights, int offsetd, int offsets){ \ static void biweight_h264_pixels ## W ## x ## H ## _c(uint8_t *dst, uint8_t *src, int stride, int log2_denom, int weightd, int weights, int offsetd, int offsets){ \
int x, y; \ int attribute_unused x, y; \
int offset = (offsets + offsetd + 1) >> 1; \ int offset = (offsets + offsetd + 1) >> 1; \
offset = ((offset << 1) + 1) << log2_denom; \ offset = ((offset << 1) + 1) << log2_denom; \
for(y=0; y<H; y++, dst += stride, src += stride){ \ for(y=0; y<H; y++, dst += stride, src += stride){ \
......
...@@ -86,7 +86,7 @@ typedef struct { ...@@ -86,7 +86,7 @@ typedef struct {
faacDecFrameInfo *hInfo, faacDecFrameInfo *hInfo,
unsigned char *buffer, unsigned char *buffer,
unsigned long buffer_size); unsigned long buffer_size);
unsigned char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode); char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode);
#endif #endif
void FAADAPI (*faacDecClose)(faacDecHandle hDecoder); void FAADAPI (*faacDecClose)(faacDecHandle hDecoder);
...@@ -126,11 +126,6 @@ static int faac_init_mp4(AVCodecContext *avctx) ...@@ -126,11 +126,6 @@ static int faac_init_mp4(AVCodecContext *avctx)
return r; return r;
} }
static int faac_init_aac(AVCodecContext *avctx)
{
return 0;
}
static int faac_decode_frame(AVCodecContext *avctx, static int faac_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) uint8_t *buf, int buf_size)
...@@ -239,7 +234,7 @@ static int faac_decode_init(AVCodecContext *avctx) ...@@ -239,7 +234,7 @@ static int faac_decode_init(AVCodecContext *avctx)
unsigned char*))); unsigned char*)));
dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*, dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*,
unsigned char*, unsigned long))); unsigned char*, unsigned long)));
dfaac(GetErrorMessage, (unsigned char* FAADAPI (*)(unsigned char))); dfaac(GetErrorMessage, (char* FAADAPI (*)(unsigned char)));
#endif #endif
#undef dfacc #undef dfacc
......
...@@ -143,6 +143,7 @@ static int64_t get_utf8(GetBitContext *gb) ...@@ -143,6 +143,7 @@ static int64_t get_utf8(GetBitContext *gb)
return val; return val;
} }
#if 0
static int skip_utf8(GetBitContext *gb) static int skip_utf8(GetBitContext *gb)
{ {
int ones=0, bytes; int ones=0, bytes;
...@@ -163,6 +164,7 @@ static int skip_utf8(GetBitContext *gb) ...@@ -163,6 +164,7 @@ static int skip_utf8(GetBitContext *gb)
} }
return 0; return 0;
} }
#endif
static int get_crc8(const uint8_t *buf, int count){ static int get_crc8(const uint8_t *buf, int count){
int crc=0; int crc=0;
......
...@@ -1940,7 +1940,6 @@ static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_t ...@@ -1940,7 +1940,6 @@ static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_t
int level= slevel < 0 ? -slevel : slevel; int level= slevel < 0 ? -slevel : slevel;
int sign= slevel < 0 ? 1 : 0; int sign= slevel < 0 ? 1 : 0;
int bits, len, code; int bits, len, code;
int level1, run1;
len_tab[index]= 100; len_tab[index]= 100;
......
...@@ -45,7 +45,9 @@ ...@@ -45,7 +45,9 @@
void *av_malloc(unsigned int size) void *av_malloc(unsigned int size)
{ {
void *ptr; void *ptr;
#ifdef MEMALIGN_HACK
int diff; int diff;
#endif
/* lets disallow possible ambiguous cases */ /* lets disallow possible ambiguous cases */
if(size > INT_MAX) if(size > INT_MAX)
...@@ -97,7 +99,10 @@ void *av_malloc(unsigned int size) ...@@ -97,7 +99,10 @@ void *av_malloc(unsigned int size)
*/ */
void *av_realloc(void *ptr, unsigned int size) void *av_realloc(void *ptr, unsigned int size)
{ {
#ifdef MEMALIGN_HACK
int diff; int diff;
#endif
/* lets disallow possible ambiguous cases */ /* lets disallow possible ambiguous cases */
if(size > INT_MAX) if(size > INT_MAX)
return NULL; return NULL;
......
...@@ -676,7 +676,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in ...@@ -676,7 +676,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
if(avctx->pix_fmt == PIX_FMT_RGBA32){ if(avctx->pix_fmt == PIX_FMT_RGBA32){
int x, y, i; int x, y, i;
const int linesize= p->linesize[0]; 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]; int left[3], top[3], topleft[3];
for(i=0; i<3; i++){ for(i=0; i<3; i++){
......
...@@ -317,6 +317,7 @@ static inline void no_motion_search(MpegEncContext * s, ...@@ -317,6 +317,7 @@ static inline void no_motion_search(MpegEncContext * s,
*my_ptr = 16 * s->mb_y; *my_ptr = 16 * s->mb_y;
} }
#if 0 /* the use of these functions is inside #if 0 */
static int full_motion_search(MpegEncContext * s, static int full_motion_search(MpegEncContext * s,
int *mx_ptr, int *my_ptr, int range, int *mx_ptr, int *my_ptr, int range,
int xmin, int ymin, int xmax, int ymax, uint8_t *ref_picture) int xmin, int ymin, int xmax, int ymax, uint8_t *ref_picture)
...@@ -537,7 +538,7 @@ static int phods_motion_search(MpegEncContext * s, ...@@ -537,7 +538,7 @@ static int phods_motion_search(MpegEncContext * s,
*my_ptr = my; *my_ptr = my;
return dminy; return dminy;
} }
#endif /* 0 */
#define Z_THRESHOLD 256 #define Z_THRESHOLD 256
...@@ -730,7 +731,6 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift) ...@@ -730,7 +731,6 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
int dmin_sum=0, mx4_sum=0, my4_sum=0; int dmin_sum=0, mx4_sum=0, my4_sum=0;
int same=1; int same=1;
const int stride= c->stride; const int stride= c->stride;
const int uvstride= c->uvstride;
uint8_t *mv_penalty= c->current_mv_penalty; uint8_t *mv_penalty= c->current_mv_penalty;
init_mv4_ref(c); init_mv4_ref(c);
...@@ -881,7 +881,6 @@ static int interlaced_search(MpegEncContext *s, int ref_index, ...@@ -881,7 +881,6 @@ static int interlaced_search(MpegEncContext *s, int ref_index,
uint8_t * const mv_penalty= c->current_mv_penalty; uint8_t * const mv_penalty= c->current_mv_penalty;
int same=1; int same=1;
const int stride= 2*s->linesize; const int stride= 2*s->linesize;
const int uvstride= 2*s->uvlinesize;
int dmin_sum= 0; int dmin_sum= 0;
const int mot_stride= s->mb_stride; const int mot_stride= s->mb_stride;
const int xy= s->mb_x + s->mb_y*mot_stride; const int xy= s->mb_x + s->mb_y*mot_stride;
......
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
//lets hope gcc will remove the unused vars ...(gcc 3.2.2 seems to do it ...) //lets hope gcc will remove the unused vars ...(gcc 3.2.2 seems to do it ...)
#define LOAD_COMMON\ #define LOAD_COMMON\
uint32_t * const score_map= c->score_map;\ uint32_t attribute_unused * const score_map= c->score_map;\
const int xmin= c->xmin;\ const int attribute_unused xmin= c->xmin;\
const int ymin= c->ymin;\ const int attribute_unused ymin= c->ymin;\
const int xmax= c->xmax;\ const int attribute_unused xmax= c->xmax;\
const int ymax= c->ymax;\ const int attribute_unused ymax= c->ymax;\
uint8_t *mv_penalty= c->current_mv_penalty;\ uint8_t *mv_penalty= c->current_mv_penalty;\
const int pred_x= c->pred_x;\ const int pred_x= c->pred_x;\
const int pred_y= c->pred_y;\ const int pred_y= c->pred_y;\
......
...@@ -132,7 +132,7 @@ int MP3lame_encode_frame(AVCodecContext *avctx, ...@@ -132,7 +132,7 @@ int MP3lame_encode_frame(AVCodecContext *avctx,
unsigned char *frame, int buf_size, void *data) unsigned char *frame, int buf_size, void *data)
{ {
Mp3AudioContext *s = avctx->priv_data; Mp3AudioContext *s = avctx->priv_data;
int len, i; int len;
int lame_result; int lame_result;
/* lame 3.91 dies on '1-channel interleaved' data */ /* lame 3.91 dies on '1-channel interleaved' data */
......
...@@ -468,6 +468,7 @@ static void compute_scale_factors(unsigned char scale_code[SBLIMIT], ...@@ -468,6 +468,7 @@ static void compute_scale_factors(unsigned char scale_code[SBLIMIT],
break; break;
default: default:
assert(0); //cant happen assert(0); //cant happen
code = 0; /* kill warning */
} }
#if 0 #if 0
......
...@@ -257,11 +257,13 @@ static inline int l3_unscale(int value, int exponent) ...@@ -257,11 +257,13 @@ static inline int l3_unscale(int value, int exponent)
static int dev_4_3_coefs[DEV_ORDER]; static int dev_4_3_coefs[DEV_ORDER];
#if 0 /* unused */
static int pow_mult3[3] = { static int pow_mult3[3] = {
POW_FIX(1.0), POW_FIX(1.0),
POW_FIX(1.25992104989487316476), POW_FIX(1.25992104989487316476),
POW_FIX(1.58740105196819947474), POW_FIX(1.58740105196819947474),
}; };
#endif
static void int_pow_init(void) static void int_pow_init(void)
{ {
...@@ -274,6 +276,7 @@ static void int_pow_init(void) ...@@ -274,6 +276,7 @@ static void int_pow_init(void)
} }
} }
#if 0 /* unused, remove? */
/* return the mantissa and the binary exponent */ /* return the mantissa and the binary exponent */
static int int_pow(int i, int *exp_ptr) static int int_pow(int i, int *exp_ptr)
{ {
...@@ -318,6 +321,7 @@ static int int_pow(int i, int *exp_ptr) ...@@ -318,6 +321,7 @@ static int int_pow(int i, int *exp_ptr)
*exp_ptr = eq; *exp_ptr = eq;
return a; return a;
} }
#endif
static int decode_init(AVCodecContext * avctx) static int decode_init(AVCodecContext * avctx)
{ {
......
...@@ -1820,7 +1820,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){ ...@@ -1820,7 +1820,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
for(i=0; i<4; i++){ for(i=0; i<4; i++){
int sx= mb_x*16 + 4 + 8*(i&1); int sx= mb_x*16 + 4 + 8*(i&1);
int sy= mb_y*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 mx= (pict->motion_val[direction][xy][0]>>shift) + sx;
int my= (pict->motion_val[direction][xy][1]>>shift) + sy; int my= (pict->motion_val[direction][xy][1]>>shift) + sy;
draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100); draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100);
...@@ -1830,7 +1830,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){ ...@@ -1830,7 +1830,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
for(i=0; i<2; i++){ for(i=0; i<2; i++){
int sx=mb_x*16 + 8; int sx=mb_x*16 + 8;
int sy=mb_y*16 + 4 + 8*i; 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 mx=(pict->motion_val[direction][xy][0]>>shift);
int my=(pict->motion_val[direction][xy][1]>>shift); int my=(pict->motion_val[direction][xy][1]>>shift);
...@@ -1844,7 +1844,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){ ...@@ -1844,7 +1844,7 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){
for(i=0; i<2; i++){ for(i=0; i<2; i++){
int sx=mb_x*16 + 4 + 8*i; int sx=mb_x*16 + 4 + 8*i;
int sy=mb_y*16 + 8; 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 mx=(pict->motion_val[direction][xy][0]>>shift);
int my=(pict->motion_val[direction][xy][1]>>shift); int my=(pict->motion_val[direction][xy][1]>>shift);
...@@ -2077,7 +2077,6 @@ static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){ ...@@ -2077,7 +2077,6 @@ static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){
int x, y, plane; int x, y, plane;
int score=0; int score=0;
int64_t score64=0; int64_t score64=0;
int64_t threshold;
for(plane=0; plane<3; plane++){ for(plane=0; plane<3; plane++){
const int stride= p->linesize[plane]; const int stride= p->linesize[plane];
......
...@@ -504,6 +504,7 @@ typedef struct MpegAudioParseContext { ...@@ -504,6 +504,7 @@ typedef struct MpegAudioParseContext {
#define MPA_HEADER_SIZE 4 #define MPA_HEADER_SIZE 4
/* header + layer + bitrate + freq + lsf/mpeg25 */ /* header + layer + bitrate + freq + lsf/mpeg25 */
#undef SAME_HEADER_MASK /* mpegaudio.h defines different version */
#define SAME_HEADER_MASK \ #define SAME_HEADER_MASK \
(0xffe00000 | (3 << 17) | (3 << 10) | (3 << 19)) (0xffe00000 | (3 << 17) | (3 << 10) | (3 << 19))
......
...@@ -58,7 +58,7 @@ void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){ ...@@ -58,7 +58,7 @@ void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){
void ff_build_rac_states(RangeCoder *c, int factor, int max_p){ void ff_build_rac_states(RangeCoder *c, int factor, int max_p){
const int64_t one= 1LL<<32; const int64_t one= 1LL<<32;
int64_t p; 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->zero_state, 0, sizeof(c->zero_state));
memset(c-> one_state, 0, sizeof(c-> one_state)); memset(c-> one_state, 0, sizeof(c-> one_state));
......
...@@ -94,7 +94,7 @@ static inline void refill(RangeCoder *c){ ...@@ -94,7 +94,7 @@ static inline void refill(RangeCoder *c){
static inline int get_rac(RangeCoder *c, uint8_t * const state){ static inline int get_rac(RangeCoder *c, uint8_t * const state){
int range1= (c->range * (*state)) >> 8; int range1= (c->range * (*state)) >> 8;
int one_mask; int attribute_unused one_mask;
c->range -= range1; c->range -= range1;
#if 1 #if 1
......
...@@ -128,7 +128,6 @@ ReSampleContext *audio_resample_init(int output_channels, int input_channels, ...@@ -128,7 +128,6 @@ ReSampleContext *audio_resample_init(int output_channels, int input_channels,
int output_rate, int input_rate) int output_rate, int input_rate)
{ {
ReSampleContext *s; ReSampleContext *s;
int i;
if ( input_channels > 2) if ( input_channels > 2)
{ {
......
...@@ -287,6 +287,7 @@ void rv20_encode_picture_header(MpegEncContext *s, int picture_number){ ...@@ -287,6 +287,7 @@ void rv20_encode_picture_header(MpegEncContext *s, int picture_number){
} }
} }
#if 0 /* unused, remove? */
static int get_num(GetBitContext *gb) static int get_num(GetBitContext *gb)
{ {
int n, n1; int n, n1;
...@@ -299,6 +300,7 @@ static int get_num(GetBitContext *gb) ...@@ -299,6 +300,7 @@ static int get_num(GetBitContext *gb)
return (n << 16) | n1; return (n << 16) | n1;
} }
} }
#endif
#endif //CONFIG_ENCODERS #endif //CONFIG_ENCODERS
......