[FFmpeg-cvslog] r9551 - in trunk/libavcodec: h263_parser.c wma.h wmaenc.c zmbv.c
mru
subversion
Mon Jul 9 01:15:08 CEST 2007
Author: mru
Date: Mon Jul 9 01:15:08 2007
New Revision: 9551
Log:
trivial warning fixes
Modified:
trunk/libavcodec/h263_parser.c
trunk/libavcodec/wma.h
trunk/libavcodec/wmaenc.c
trunk/libavcodec/zmbv.c
Modified: trunk/libavcodec/h263_parser.c
==============================================================================
--- trunk/libavcodec/h263_parser.c (original)
+++ trunk/libavcodec/h263_parser.c Mon Jul 9 01:15:08 2007
@@ -71,7 +71,7 @@ static int h263_parse(AVCodecParserConte
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_size = 0;
return buf_size;
Modified: trunk/libavcodec/wma.h
==============================================================================
--- trunk/libavcodec/wma.h (original)
+++ trunk/libavcodec/wma.h Mon Jul 9 01:15:08 2007
@@ -92,7 +92,7 @@ typedef struct WMACodecContext {
uint16_t *run_table[2];
uint16_t *level_table[2];
uint16_t *int_table[2];
- CoefVLCTable *coef_vlcs[2];
+ const CoefVLCTable *coef_vlcs[2];
/* frame info */
int frame_len; ///< frame length in samples
int frame_len_bits; ///< frame_len = 1 << frame_len_bits
Modified: trunk/libavcodec/wmaenc.c
==============================================================================
--- trunk/libavcodec/wmaenc.c (original)
+++ trunk/libavcodec/wmaenc.c Mon Jul 9 01:15:08 2007
@@ -94,7 +94,7 @@ static void apply_window_and_mdct(AVCode
}
//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;
const uint16_t *ptr;
float v, *q, max_scale, *q_end;
@@ -324,7 +324,7 @@ static int encode_superframe(AVCodecCont
unsigned char *buf, int buf_size, void *data){
WMACodecContext *s = avctx->priv_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 = 1 << s->block_len_bits;
Modified: trunk/libavcodec/zmbv.c
==============================================================================
--- trunk/libavcodec/zmbv.c (original)
+++ trunk/libavcodec/zmbv.c Mon Jul 9 01:15:08 2007
@@ -535,7 +535,7 @@ static int decode_frame(AVCodecContext *
out[i * 3 + 0] = c->pal[(*src) * 3 + 0];
out[i * 3 + 1] = c->pal[(*src) * 3 + 1];
out[i * 3 + 2] = c->pal[(*src) * 3 + 2];
- *src++;
+ src++;
}
out += c->pic.linesize[0];
}
More information about the ffmpeg-cvslog
mailing list