Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / metadata.h

diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index d826c6f144225df4dbda1b0e1ca794c6376930ce..6586094e8213d8a3368f59dee288bec5b7082ef8 100644 (file)
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -31,13 +31,10 @@
 #include "avformat.h"
 #include "libavutil/dict.h"
 
-struct AVMetadataConv{
+typedef struct AVMetadataConv {
     const char *native;
     const char *generic;
-};
-#if !FF_API_OLD_METADATA2
-typedef struct AVMetadataConv AVMetadataConv;
-#endif
+} AVMetadataConv;
 
 void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
                                        const AVMetadataConv *s_conv);