[PATCH 1/6] revert MXFCodecUL struct modification from r11567

[storyparts]

---
 libavformat/mxf.h    |    6 ++++++
 libavformat/mxfdec.c |    5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 99553a5..9702998 100644
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -46,6 +46,11 @@ enum MXFMetadataSetType {
     TypeBottom,// add metadata type before this
 };
 
+enum MXFWrappingScheme {
+    Frame,
+    Clip,
+};
+
 typedef struct {
     UID key;
     int64_t offset;
@@ -56,6 +61,7 @@ typedef struct {
     UID uid;
     unsigned matching_len;
     int id;
+    enum MXFWrappingScheme wrapping;
 } MXFCodecUL;
 
 extern const MXFCodecUL ff_mxf_data_definition_uls[];
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 168fd8d..0919caa 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -134,11 +134,6 @@ typedef struct {
     int local_tags_count;
 } MXFContext;
 
-enum MXFWrappingScheme {
-    Frame,
-    Clip,
-};
-
 typedef struct {
     const UID key;
     int (*read)();
-- 
1.6.6.1


--------------090900080504020001000507
Content-Type: text/x-patch;
 name="0002-partially-revert-essence_container-from-r11567.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="0002-partially-revert-essence_container-from-r11567.patch"