har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
it will be useful for attached pictures in ID3v2
This commit is contained in:
Anton Khirnov 2011-01-19 10:21:29 +01:00
parent eaea76d72c
commit b73ad74660
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/internal.h
View File

@ -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__

6
libavformat/matroska.h
View File

@ -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