Make ff_interleave_compare_dts static to utils.c.

[ffmpeg] / libavformat / mxf.h

diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 5094575cfe95331f169788918e12048a8039275e..11bd8772a8af668a66663fb9ff8a6152afb0531d 100644 (file)
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -21,8 +21,8 @@
 #ifndef AVFORMAT_MXF_H
 #define AVFORMAT_MXF_H
 
-#include "avformat.h"
-#include "libavcodec/bytestream.h"
+#include "libavcodec/avcodec.h"
+#include <stdint.h>
 
 typedef uint8_t UID[16];
 
@@ -55,22 +55,22 @@ typedef struct {
 typedef struct {
     UID uid;
     unsigned matching_len;
-    enum CodecID id;
+    int id;
 } MXFCodecUL;
 
+extern const MXFCodecUL ff_mxf_data_definition_uls[];
+extern const MXFCodecUL ff_mxf_codec_uls[];
+
 typedef struct {
-    UID uid;
-    enum CodecType type;
-} MXFDataDefinitionUL;
+    enum PixelFormat pix_fmt;
+    const char data[16];
+} MXFPixelLayout;
 
-extern const MXFDataDefinitionUL ff_mxf_data_definition_uls[];
-extern const MXFCodecUL ff_mxf_codec_uls[];
+extern const MXFPixelLayout ff_mxf_pixel_layouts[];
+
+int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum PixelFormat *pix_fmt);
 
-#ifdef DEBUG
 #define PRINT_KEY(pc, s, x) dprintf(pc, "%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
                              (x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5], (x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14], (x)[15])
-#else
-#define PRINT_KEY(pc, s, x)
-#endif
 
 #endif /* AVFORMAT_MXF_H */