* keeping compiler happy and quiet

Originally committed as revision 1817 to svn://svn.ffmpeg.org/ffmpeg/trunk

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 */

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));

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;