libgsm installs headers in a subdirectory, use gsm.h from that subdirectory.

[ffmpeg] / libavformat / metadata.h

diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index e9ada571a1e257c45f340c18d8caab611f11bcba..9ec2265a41c42f457890321b707b45a7ca932637 100644 (file)
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -22,7 +22,7 @@
 #define AVFORMAT_METADATA_H
 
 /**
- * @file metadata.h
+ * @file libavformat/metadata.h
  * internal metadata API header
  * see avformat.h or the public API!
  */
@@ -30,9 +30,19 @@
 
 #include "avformat.h"
 
-struct AVMetaData{
+struct AVMetadata{
     int count;
-    AVMetaDataTag *elems;
+    AVMetadataTag *elems;
 };
 
+struct AVMetadataConv{
+    const char *native;
+    const char *generic;
+};
+
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+void ff_metadata_demux_compat(AVFormatContext *s);
+void ff_metadata_mux_compat(AVFormatContext *s);
+#endif
+
 #endif /* AVFORMAT_METADATA_H */