summaryrefslogtreecommitdiff
path: root/libavformat/metadata.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-12 13:31:55 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-27 10:52:42 +0100
commit38233fc13106627e05add93df227ec72a11ed24a (patch)
tree0f5d39a330a3d4ec013f42ea4f9e7e70bfe9c285 /libavformat/metadata.h
parent2439f2ca82e28aa38b8aa2512bdb5a328e946cb9 (diff)
lavf: remove disabled FF_API_OLD_METADATA2 cruft
Diffstat (limited to 'libavformat/metadata.h')
-rw-r--r--libavformat/metadata.h7
1 files changed, 2 insertions, 5 deletions
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);