# HG changeset patch # User bcoudurier # Date 1234068158 0 # Node ID 39f6b190c7726275d8f6a56897d3e370f04447fe # Parent 671d415e1786e7fd68a1ac5c8758cb37e4551c3a remove implicit header inclusions from mxf.h diff -r 671d415e1786 -r 39f6b190c772 mxf.c --- a/mxf.c Sun Feb 08 04:35:36 2009 +0000 +++ b/mxf.c Sun Feb 08 04:42:38 2009 +0000 @@ -41,6 +41,7 @@ { { 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 -r 671d415e1786 -r 39f6b190c772 mxf.h --- a/mxf.h Sun Feb 08 04:35:36 2009 +0000 +++ b/mxf.h Sun Feb 08 04:42:38 2009 +0000 @@ -21,9 +21,8 @@ #ifndef AVFORMAT_MXF_H #define AVFORMAT_MXF_H -#include -#include "avformat.h" -#include "libavcodec/bytestream.h" +#include "libavcodec/avcodec.h" +#include typedef uint8_t UID[16]; diff -r 671d415e1786 -r 39f6b190c772 mxfdec.c --- a/mxfdec.c Sun Feb 08 04:35:36 2009 +0000 +++ b/mxfdec.c Sun Feb 08 04:42:38 2009 +0000 @@ -46,6 +46,8 @@ //#define DEBUG #include "libavutil/aes.h" +#include "libavcodec/bytestream.h" +#include "avformat.h" #include "mxf.h" typedef struct { diff -r 671d415e1786 -r 39f6b190c772 mxfenc.c --- a/mxfenc.c Sun Feb 08 04:35:36 2009 +0000 +++ b/mxfenc.c Sun Feb 08 04:42:38 2009 +0000 @@ -36,7 +36,9 @@ #include #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 };