[SCM] libav/experimental: remove mxf_build_structural_metadata, simplify

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f05773ea8fd73afdd9ebc88c8f4bf0a236b691e4
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun Aug 31 04:25:39 2008 +0000

    remove mxf_build_structural_metadata, simplify
    
    Originally committed as revision 15113 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 5fcffd8..36af7ba 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -636,13 +636,7 @@ static void mxf_write_package(AVFormatContext *s, enum MXFMetadataSetType type)
         mxf_write_local_tag(pb, 16, 0x4701);
         mxf_write_uuid(pb, MultipleDescriptor, 0);
     }
-}
-
-static void mxf_build_structural_metadata(AVFormatContext *s, enum MXFMetadataSetType type)
-{
-    int i;
 
-    mxf_write_package(s, type);
     if (type == SourcePackage)
         mxf_write_multi_descriptor(s);
 
@@ -664,8 +658,8 @@ static int mxf_write_header_metadata_sets(AVFormatContext *s)
     mxf_write_preface(s);
     mxf_write_identification(s);
     mxf_write_content_storage(s);
-    mxf_build_structural_metadata(s, MaterialPackage);
-    mxf_build_structural_metadata(s, SourcePackage);
+    mxf_write_package(s, MaterialPackage);
+    mxf_write_package(s, SourcePackage);
     return 0;
 }
 

-- 
Libav/FFmpeg packaging