diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-04-23 18:38:34 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-04-23 18:38:34 +0000 |
| commit | 546031ee868c2b1b61c5878051e50c2bbad34096 (patch) | |
| tree | 8a6d0c7de420af9d7bb4b4d8ab7168a10ee232a2 | |
| parent | b6a17df4381d7d7b257ae7b939fe891dfae4d912 (diff) | |
| download | ffmpeg-546031ee868c2b1b61c5878051e50c2bbad34096.tar.gz | |
* keeping compiler happy and quiet
Originally committed as revision 1817 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avi.h | 7 | ||||
| -rw-r--r-- | libavformat/avienc.c | 4 | ||||
| -rw-r--r-- | libavformat/aviobuf.c | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/libavformat/avi.h b/libavformat/avi.h index 73a43032d4..25feebfcf6 100644 --- 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 2194af0f57..bee61db113 100644 --- 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 11d00f239d..6e5be72261 100644 --- 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; |