diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-02-08 04:42:38 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-02-08 04:42:38 +0000 |
| commit | 251bf87560c0c4d1c0a35e73eed76fa6d60a6ab3 (patch) | |
| tree | a76d00ae6f02a055b4561f31e2b0544385923c88 | |
| parent | 84a2d3045bfea9a53b9a085a0ce7beb671015512 (diff) | |
| download | ffmpeg-251bf87560c0c4d1c0a35e73eed76fa6d60a6ab3.tar.gz | |
remove implicit header inclusions from mxf.h
Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/mxf.c | 1 | ||||
| -rw-r--r-- | libavformat/mxf.h | 5 | ||||
| -rw-r--r-- | libavformat/mxfdec.c | 2 | ||||
| -rw-r--r-- | libavformat/mxfenc.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 1893d21ca4..cd84cb5264 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -41,6 +41,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, 13, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_RAWVIDEO }, /* Uncompressed */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ /* SoundEssenceCompression */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16LE }, /* Uncompressed */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16LE }, diff --git a/libavformat/mxf.h b/libavformat/mxf.h index 7c1e2ee350..ff6ad00249 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -21,9 +21,8 @@ #ifndef AVFORMAT_MXF_H #define AVFORMAT_MXF_H -#include <string.h> -#include "avformat.h" -#include "libavcodec/bytestream.h" +#include "libavcodec/avcodec.h" +#include <stdint.h> typedef uint8_t UID[16]; diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index ce6de5f0d9..7090e23fd1 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -46,6 +46,8 @@ //#define DEBUG #include "libavutil/aes.h" +#include "libavcodec/bytestream.h" +#include "avformat.h" #include "mxf.h" typedef struct { diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index b6eda6c63e..6381cad603 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -36,7 +36,9 @@ #include <time.h> #include "libavutil/fifo.h" +#include "libavcodec/bytestream.h" #include "audiointerleave.h" +#include "avformat.h" #include "mxf.h" static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 }; |