From 6785cae35c4b5d407eac2d06d95e7049c191d1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Sun, 8 Jul 2007 23:15:08 +0000
Subject: [PATCH] trivial warning fixes

Originally committed as revision 9551 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/h263_parser.c | 2 +-
 libavcodec/wma.h         | 2 +-
 libavcodec/wmaenc.c      | 4 ++--
 libavcodec/zmbv.c        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/h263_parser.c b/libavcodec/h263_parser.c
index 53a26c05cd..c289ca3cc5 100644
--- a/libavcodec/h263_parser.c
+++ b/libavcodec/h263_parser.c
@@ -71,7 +71,7 @@ static int h263_parse(AVCodecParserContext *s,
 
     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;
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index e9b0cd3789..b5a043bd36 100644
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -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
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index e35f363b63..e2cdebf228 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -94,7 +94,7 @@ static void apply_window_and_mdct(AVCodecContext * avctx, signed short * audio,
 }
 
 //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(AVCodecContext *avctx,
                             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;
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index d0b2f3afa7..f7448ef7a8 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -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 + 1] = c->pal[(*src) * 3 + 1];
                     out[i * 3 + 2] = c->pal[(*src) * 3 + 2];
-                    *src++;
+                    src++;
                 }
                 out += c->pic.linesize[0];
             }