Mercurial > libavformat.hg
changeset 6033:c7b98381ec2d libavformat
Move AVCodecTag from riff.h into internal.h.
Patch by Francesco Lavra, francescolavra interfree it
| author | cehoyos |
|---|---|
| date | Sat, 22 May 2010 16:01:32 +0000 |
| parents | 44d635df3f26 |
| children | bf6169d77dbd |
| files | caf.c caf.h flvenc.c internal.h isom.c isom.h nut.c nutenc.c riff.h voc.c vocdec.c vocenc.c |
| diffstat | 12 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/caf.c Sat May 22 15:56:49 2010 +0000 +++ b/caf.c Sat May 22 16:01:32 2010 +0000 @@ -25,7 +25,7 @@ */ #include "avformat.h" -#include "riff.h" +#include "internal.h" #include "caf.h" /**
--- a/caf.h Sat May 22 15:56:49 2010 +0000 +++ b/caf.h Sat May 22 16:01:32 2010 +0000 @@ -27,7 +27,7 @@ #ifndef AVFORMAT_CAF_H #define AVFORMAT_CAF_H -#include "riff.h" +#include "internal.h" extern const AVCodecTag ff_codec_caf_tags[];
--- a/flvenc.c Sat May 22 15:56:49 2010 +0000 +++ b/flvenc.c Sat May 22 16:01:32 2010 +0000 @@ -20,7 +20,7 @@ */ #include "avformat.h" #include "flv.h" -#include "riff.h" +#include "internal.h" #include "avc.h" #undef NDEBUG
--- a/internal.h Sat May 22 15:56:49 2010 +0000 +++ b/internal.h Sat May 22 16:01:32 2010 +0000 @@ -24,6 +24,11 @@ #include <stdint.h> #include "avformat.h" +typedef struct AVCodecTag { + enum CodecID id; + unsigned int tag; +} AVCodecTag; + void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem); #ifdef __GNUC__
--- a/isom.c Sat May 22 15:56:49 2010 +0000 +++ b/isom.c Sat May 22 16:01:32 2010 +0000 @@ -22,7 +22,7 @@ */ #include "avformat.h" -#include "riff.h" +#include "internal.h" #include "isom.h" /* http://www.mp4ra.org */
--- a/isom.h Sat May 22 15:56:49 2010 +0000 +++ b/isom.h Sat May 22 16:01:32 2010 +0000 @@ -25,7 +25,7 @@ #define AVFORMAT_ISOM_H #include "avio.h" -#include "riff.h" +#include "internal.h" #include "dv.h" /* isom.c */
--- a/nut.c Sat May 22 15:56:49 2010 +0000 +++ b/nut.c Sat May 22 16:01:32 2010 +0000 @@ -21,6 +21,7 @@ #include "libavutil/tree.h" #include "nut.h" +#include "internal.h" const AVCodecTag ff_nut_subtitle_tags[] = { { CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
--- a/nutenc.c Sat May 22 15:56:49 2010 +0000 +++ b/nutenc.c Sat May 22 16:01:32 2010 +0000 @@ -23,6 +23,7 @@ #include "libavutil/tree.h" #include "libavcodec/mpegaudiodata.h" #include "nut.h" +#include "internal.h" static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){ int sample_rate= c->sample_rate;
--- a/riff.h Sat May 22 15:56:49 2010 +0000 +++ b/riff.h Sat May 22 16:01:32 2010 +0000 @@ -30,15 +30,11 @@ #include "libavcodec/avcodec.h" #include "avio.h" +#include "internal.h" int64_t ff_start_tag(ByteIOContext *pb, const char *tag); void ff_end_tag(ByteIOContext *pb, int64_t start); -typedef struct AVCodecTag { - enum CodecID id; - unsigned int tag; -} AVCodecTag; - void ff_put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf); int ff_put_wav_header(ByteIOContext *pb, AVCodecContext *enc); enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps);
--- a/voc.c Sat May 22 15:56:49 2010 +0000 +++ b/voc.c Sat May 22 16:01:32 2010 +0000 @@ -20,6 +20,7 @@ */ #include "voc.h" +#include "internal.h" const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A";