remove implicit header inclusions from mxf.h
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sun, 8 Feb 2009 04:42:38 +0000 (04:42 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sun, 8 Feb 2009 04:42:38 +0000 (04:42 +0000)
Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/mxf.c
libavformat/mxf.h
libavformat/mxfdec.c
libavformat/mxfenc.c

index 1893d21..cd84cb5 100644 (file)
@@ -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 },
index 7c1e2ee..ff6ad00 100644 (file)
@@ -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];
 
index ce6de5f..7090e23 100644 (file)
@@ -46,6 +46,8 @@
 //#define DEBUG
 
 #include "libavutil/aes.h"
+#include "libavcodec/bytestream.h"
+#include "avformat.h"
 #include "mxf.h"
 
 typedef struct {
index b6eda6c..6381cad 100644 (file)
@@ -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 };