[FFmpeg-cvslog] lavf: move CodecMime from matroska.h to internal.h

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Jan 19 10:21:29 2011 +0100| [b73ad746606e193aa3e2dde20ce8afeeb8fa7e0e] | committer: Anton Khirnov

lavf: move CodecMime from matroska.h to internal.h

it will be useful for attached pictures in ID3v2

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b73ad746606e193aa3e2dde20ce8afeeb8fa7e0e
---

 libavformat/internal.h |    5 +++++
 libavformat/matroska.h |    6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libavformat/internal.h b/libavformat/internal.h
index fb29853..c30deb7 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 8e747e6..ada735f 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