Set channel layout for 4 and 5.1 channel cdata audio files

[ffmpeg] / libavformat / metadata.h

diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 9ec2265a41c42f457890321b707b45a7ca932637..55e1ed74d28b3f9ceb351b2e4964a33a66c3a307 100644 (file)
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -22,7 +22,7 @@
 #define AVFORMAT_METADATA_H
 
 /**
- * @file libavformat/metadata.h
+ * @file
  * internal metadata API header
  * see avformat.h or the public API!
  */
@@ -39,10 +39,13 @@ 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);
+#if !FF_API_OLD_METADATA2
+typedef struct AVMetadataConv AVMetadataConv;
 #endif
 
+void ff_metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
+                                       const AVMetadataConv *s_conv);
+void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+                                                const AVMetadataConv *s_conv);
+
 #endif /* AVFORMAT_METADATA_H */