mpegts: Fix dead error checks

[ffmpeg] / libavformat / metadata.h

diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 0d2f1ab4a6007f6e4cd623ca2422249e8396c048..eee3ee4391e97c426541f6db931fc13e99898d53 100644 (file)
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -29,26 +29,14 @@
 
 
 #include "avformat.h"
+#include "libavutil/dict.h"
 
-struct AVMetadata{
-    int count;
-    AVMetadataTag *elems;
-};
-
-struct AVMetadataConv{
+typedef struct AVMetadataConv {
     const char *native;
     const char *generic;
-};
-#if !FF_API_OLD_METADATA
-typedef struct AVMetadataConv AVMetadataConv;
-#endif
-
-#if FF_API_OLD_METADATA
-void ff_metadata_demux_compat(AVFormatContext *s);
-void ff_metadata_mux_compat(AVFormatContext *s);
-#endif
+} AVMetadataConv;
 
-void ff_metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
+void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
                                        const AVMetadataConv *s_conv);
 void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
                                                 const AVMetadataConv *s_conv);