Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / avi.h

diff --git a/libavformat/avi.h b/libavformat/avi.h
index b4e551971aa15c1fbf467637cb82006ed007cd82..34da76f715145e976c596459202043b9831ec9e5 100644 (file)
--- a/libavformat/avi.h
+++ b/libavformat/avi.h
@@ -21,8 +21,6 @@
 #ifndef AVFORMAT_AVI_H
 #define AVFORMAT_AVI_H
 
-#include "metadata.h"
-
 #define AVIF_HASINDEX           0x00000010        // Index at end of file?
 #define AVIF_MUSTUSEINDEX       0x00000020
 #define AVIF_ISINTERLEAVED      0x00000100
@@ -37,11 +35,4 @@
 /* index flags */
 #define AVIIF_INDEX             0x10
 
-extern const AVMetadataConv ff_avi_metadata_conv[];
-
-/**
- * A list of AVI info tags.
- */
-extern const char ff_avi_tags[][5];
-
 #endif /* AVFORMAT_AVI_H */