it will be useful for attached pictures in ID3v2
---
libavformat/internal.h | 5 +++++
libavformat/matroska.c | 2 +-
libavformat/matroska.h | 8 ++------
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/libavformat/internal.h b/libavformat/internal.h
index fb29853..f512c94 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -37,6 +37,11 @@ typedef struct AVCodecTag {
unsigned int tag;
} AVCodecTag;
+typedef struct FFCodecMime{
+ char str[32];
+ enum CodecID id;
+} FFCodecMime;
+
void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
#ifdef __GNUC__
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index b448af2..1b93830 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -82,7 +82,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"" , CODEC_ID_NONE}
};
-const CodecMime ff_mkv_mime_tags[] = {
+const FFCodecMime ff_mkv_mime_tags[] = {
{"text/plain" , CODEC_ID_TEXT},
{"image/gif" , CODEC_ID_GIF},
{"image/jpeg" , CODEC_ID_MJPEG},
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 8e747e6..946eb9c 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -24,6 +24,7 @@
#include "libavcodec/avcodec.h"
#include "metadata.h"
+#include "internal.h"
/* EBML version supported */
#define EBML_VERSION 1
@@ -245,16 +246,11 @@ typedef struct CodecTags{
enum CodecID id;
}CodecTags;
-typedef struct CodecMime{
- char str[32];
- enum CodecID id;
-}CodecMime;
-
/* max. depth in the EBML tree structure */
#define EBML_MAX_DEPTH 16
extern const CodecTags ff_mkv_codec_tags[];
-extern const CodecMime ff_mkv_mime_tags[];
+extern const FFCodecMime ff_mkv_mime_tags[];
extern const AVMetadataConv ff_mkv_metadata_conv[];
#endif /* AVFORMAT_MATROSKA_H */
--
1.7.9
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
