summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-01-19 10:21:29 +0100
committerAnton Khirnov <anton@khirnov.net>2012-02-29 13:57:59 +0100
commitb73ad746606e193aa3e2dde20ce8afeeb8fa7e0e (patch)
tree218de164d63d035da48e106d9dcdc259027450e2 /libavformat
parenteaea76d72ce56f0c9ae4b15dbb6629ef1b027de7 (diff)
lavf: move CodecMime from matroska.h to internal.h
it will be useful for attached pictures in ID3v2
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/internal.h5
-rw-r--r--libavformat/matroska.h6
2 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h
index fb298539b6..c30deb7732 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -37,6 +37,11 @@ typedef struct AVCodecTag {
unsigned int tag;
} AVCodecTag;
+typedef struct CodecMime{
+ char str[32];
+ enum CodecID id;
+} CodecMime;
+
void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
#ifdef __GNUC__
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 8e747e6a9c..ada735f172 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,11 +246,6 @@ 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