RTSP: Add a second URLContext for outgoing messages

[ffmpeg] / libavformat / mxf.h

diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 9d9d0360ca5da6ce8a2fdf35f90d7d2238c0f966..99553a53781951c88bfaf5003f8f82e101b51f20 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,11 +18,11 @@
  * 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 "avformat.h"
-#include "libavcodec/bytestream.h"
+#include "libavcodec/avcodec.h"
+#include <stdint.h>
 
 typedef uint8_t UID[16];
 
@@ -41,29 +41,25 @@ 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;
 
 typedef struct {
     UID uid;
     unsigned matching_len;
-    enum CodecID id;
+    int id;
 } MXFCodecUL;
 
-typedef struct {
-    UID uid;
-    enum CodecType type;
-} MXFDataDefinitionUL;
-
-extern const MXFDataDefinitionUL ff_mxf_data_definition_uls[];
+extern const MXFCodecUL ff_mxf_data_definition_uls[];
 extern const MXFCodecUL ff_mxf_codec_uls[];
-extern const MXFCodecUL ff_mxf_essence_container_uls[6];
 
 #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 +68,4 @@ extern const MXFCodecUL ff_mxf_essence_container_uls[6];
 #define PRINT_KEY(pc, s, x)
 #endif
 
-#endif /* FFMPEG_MXF_H */
+#endif /* AVFORMAT_MXF_H */