* keeping compiler happy and quiet

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1817 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/avi.h b/libavformat/avi.h
index 73a43032d4e113abc920b4c2a58bb46f04793318..25feebfcf6a5c224be4f7e83b1a1fabd2b5fc378 100644 (file)
--- a/libavformat/avi.h
+++ b/libavformat/avi.h
@@ -1,3 +1,7 @@
+#ifndef FFMPEG_AVI_H
+#define FFMPEG_AVI_H
+
+#include "avcodec.h"
 
 #define AVIF_HASINDEX          0x00000010      // Index at end of file?
 #define AVIF_MUSTUSEINDEX      0x00000020
@@ -27,5 +31,6 @@ extern const CodecTag codec_bmp_tags[];
 extern const CodecTag codec_wav_tags[];
 
 unsigned int codec_get_tag(const CodecTag *tags, int id);
-enum CodecID;
 enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag);
+
+#endif /* FFMPEG_AVI_H */

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 2194af0f57e1f6e2d6528c5fa62333888f947172..bee61db1131f525ed518b49628f8b762845601b7 100644 (file)
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -525,9 +525,9 @@ static int avi_write_idx1(AVFormatContext *s)
     unsigned char tag[5];
 
     if (!url_is_streamed(pb)) {
-       AVIIentry* ie, *tie;
+       AVIIentry* ie = 0, *tie;
        int entry[MAX_STREAMS];
-       int empty, stream_id;
+       int empty, stream_id = -1;
 
        idx_chunk = start_tag(pb, "idx1");
        memset(&entry[0], 0, sizeof(entry));

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 11d00f239d57a528638890a9121ed4455c5a6382..6e5be722611356d72bf8090e5f55e89bfea3c540 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -556,7 +556,6 @@ static void dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
 {
     DynBuffer *d = opaque;
     int new_size, new_allocated_size;
-    uint8_t *new_buffer;
     
     /* reallocate buffer if needed */
     new_size = d->pos + buf_size;