trivial warning fixes

Originally committed as revision 9551 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Måns Rullgård 18 years ago
parent 4a64abdc63
commit 6785cae35c
  1. 2
      libavcodec/h263_parser.c
  2. 2
      libavcodec/wma.h
  3. 4
      libavcodec/wmaenc.c
  4. 2
      libavcodec/zmbv.c

@ -71,7 +71,7 @@ static int h263_parse(AVCodecParserContext *s,
next= ff_h263_find_frame_end(pc, buf, buf_size); next= ff_h263_find_frame_end(pc, buf, buf_size);
if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL; *poutbuf = NULL;
*poutbuf_size = 0; *poutbuf_size = 0;
return buf_size; return buf_size;

@ -92,7 +92,7 @@ typedef struct WMACodecContext {
uint16_t *run_table[2]; uint16_t *run_table[2];
uint16_t *level_table[2]; uint16_t *level_table[2];
uint16_t *int_table[2]; uint16_t *int_table[2];
CoefVLCTable *coef_vlcs[2]; const CoefVLCTable *coef_vlcs[2];
/* frame info */ /* frame info */
int frame_len; ///< frame length in samples int frame_len; ///< frame length in samples
int frame_len_bits; ///< frame_len = 1 << frame_len_bits int frame_len_bits; ///< frame_len = 1 << frame_len_bits

@ -94,7 +94,7 @@ static void apply_window_and_mdct(AVCodecContext * avctx, signed short * audio,
} }
//FIXME use for decoding too //FIXME use for decoding too
static void init_exp(WMACodecContext *s, int ch, int *exp_param){ static void init_exp(WMACodecContext *s, int ch, const int *exp_param){
int n; int n;
const uint16_t *ptr; const uint16_t *ptr;
float v, *q, max_scale, *q_end; float v, *q, max_scale, *q_end;
@ -324,7 +324,7 @@ static int encode_superframe(AVCodecContext *avctx,
unsigned char *buf, int buf_size, void *data){ unsigned char *buf, int buf_size, void *data){
WMACodecContext *s = avctx->priv_data; WMACodecContext *s = avctx->priv_data;
short *samples = data; short *samples = data;
int i, total_gain, best; int i, total_gain;
s->block_len_bits= s->frame_len_bits; //required by non variable block len s->block_len_bits= s->frame_len_bits; //required by non variable block len
s->block_len = 1 << s->block_len_bits; s->block_len = 1 << s->block_len_bits;

@ -535,7 +535,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
out[i * 3 + 0] = c->pal[(*src) * 3 + 0]; out[i * 3 + 0] = c->pal[(*src) * 3 + 0];
out[i * 3 + 1] = c->pal[(*src) * 3 + 1]; out[i * 3 + 1] = c->pal[(*src) * 3 + 1];
out[i * 3 + 2] = c->pal[(*src) * 3 + 2]; out[i * 3 + 2] = c->pal[(*src) * 3 + 2];
*src++; src++;
} }
out += c->pic.linesize[0]; out += c->pic.linesize[0];
} }

Loading…
Cancel
Save