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

it will be useful for attached pictures in ID3v2
pull/3/merge
Anton Khirnov 14 years ago
parent eaea76d72c
commit b73ad74660
  1. 5
      libavformat/internal.h
  2. 6
      libavformat/matroska.h

@ -37,6 +37,11 @@ typedef struct AVCodecTag {
unsigned int tag; unsigned int tag;
} AVCodecTag; } 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); void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
#ifdef __GNUC__ #ifdef __GNUC__

@ -24,6 +24,7 @@
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "metadata.h" #include "metadata.h"
#include "internal.h"
/* EBML version supported */ /* EBML version supported */
#define EBML_VERSION 1 #define EBML_VERSION 1
@ -245,11 +246,6 @@ typedef struct CodecTags{
enum CodecID id; enum CodecID id;
}CodecTags; }CodecTags;
typedef struct CodecMime{
char str[32];
enum CodecID id;
}CodecMime;
/* max. depth in the EBML tree structure */ /* max. depth in the EBML tree structure */
#define EBML_MAX_DEPTH 16 #define EBML_MAX_DEPTH 16

Loading…
Cancel
Save