From 38233fc13106627e05add93df227ec72a11ed24a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 12 Jan 2012 13:31:55 +0100 Subject: lavf: remove disabled FF_API_OLD_METADATA2 cruft --- libavformat/metadata.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libavformat/metadata.h') diff --git a/libavformat/metadata.h b/libavformat/metadata.h index 33e0d1ff6c..eee3ee4391 100644 --- 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); -- cgit v1.2.3