Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

[ffmpeg] / libavformat / avi.h

diff --git a/libavformat/avi.h b/libavformat/avi.h
index 05f193b6192766f161fb76886be99cae2096b42d..b4e551971aa15c1fbf467637cb82006ed007cd82 100644 (file)
--- a/libavformat/avi.h
+++ b/libavformat/avi.h
@@ -1,7 +1,27 @@
-#ifndef FFMPEG_AVI_H
-#define FFMPEG_AVI_H
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
-#include "avcodec.h"
+#ifndef AVFORMAT_AVI_H
+#define AVFORMAT_AVI_H
+
+#include "metadata.h"
 
 #define AVIF_HASINDEX           0x00000010        // Index at end of file?
 #define AVIF_MUSTUSEINDEX       0x00000020
@@ -12,8 +32,16 @@
 
 #define AVI_MAX_RIFF_SIZE       0x40000000LL
 #define AVI_MASTER_INDEX_SIZE   256
+#define AVI_MAX_STREAM_COUNT    100
 
 /* index flags */
 #define AVIIF_INDEX             0x10
 
-#endif /* FFMPEG_AVI_H */
+extern const AVMetadataConv ff_avi_metadata_conv[];
+
+/**
+ * A list of AVI info tags.
+ */
+extern const char ff_avi_tags[][5];
+
+#endif /* AVFORMAT_AVI_H */