Reformat rdt_demuxer AVCodec struct sanely.

[ffmpeg] / libavformat / mxf.h

diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index b6ba22ada456736c6bd561e68e10b904d5c07109..7c1e2ee350a55bd0f2f81fb183d2e17c3a16eb83 100644 (file)
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -1,6 +1,6 @@
 /*
  * MXF
- * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>.
+ * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
  *
  * This file is part of FFmpeg.
  *
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFMPEG_MXF_H
-#define FFMPEG_MXF_H
+#ifndef AVFORMAT_MXF_H
+#define AVFORMAT_MXF_H
 
+#include <string.h>
 #include "avformat.h"
 #include "libavcodec/bytestream.h"
 
@@ -41,12 +42,14 @@ enum MXFMetadataSetType {
     Identification,
     ContentStorage,
     SubDescriptor,
+    IndexTableSegment,
+    EssenceContainerData,
     TypeBottom,// add metadata type before this
 };
 
 typedef struct {
     UID key;
-    offset_t offset;
+    int64_t offset;
     uint64_t length;
 } KLVPacket;
 
@@ -63,7 +66,6 @@ typedef struct {
 
 extern const MXFDataDefinitionUL ff_mxf_data_definition_uls[];
 extern const MXFCodecUL ff_mxf_codec_uls[];
-extern const MXFCodecUL ff_mxf_essence_container_uls[];
 
 #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, \
@@ -72,4 +74,4 @@ extern const MXFCodecUL ff_mxf_essence_container_uls[];
 #define PRINT_KEY(pc, s, x)
 #endif
 
-#endif /* FFMPEG_MXF_H */
+#endif /* AVFORMAT_MXF_H */