remove unneeded and empty user data

Originally committed as revision 17886 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/gxfenc.c

@@ -53,8 +53,6 @@ typedef struct GXFContext {
     uint32_t umf_start_offset;
     uint32_t umf_track_offset;
     uint32_t umf_media_offset;
-    uint32_t umf_user_data_offset;
-    uint32_t umf_user_data_size;
     uint32_t umf_length;
     uint16_t umf_track_size;
     uint16_t umf_media_size;
@@ -406,8 +404,8 @@ static int gxf_write_umf_payload(AVFormatContext *s)
     put_le32(pb, s->nb_streams);
     put_le32(pb, gxf->umf_media_offset);
     put_le32(pb, gxf->umf_media_size);
-    put_le32(pb, gxf->umf_user_data_offset); /* user data offset */
-    put_le32(pb, gxf->umf_user_data_size); /* user data size */
+    put_le32(pb, gxf->umf_length); /* user data offset */
+    put_le32(pb, 0); /* user data size */
     put_le32(pb, 0); /* reserved */
     put_le32(pb, 0); /* reserved */
     return 48;
@@ -568,24 +566,6 @@ static int gxf_write_umf_media_description(AVFormatContext *s)
     return url_ftell(pb) - pos;
 }
 
-static int gxf_write_umf_user_data(AVFormatContext *s)
-{
-    GXFContext *gxf = s->priv_data;
-    ByteIOContext *pb = s->pb;
-    int64_t pos = url_ftell(pb);
-    gxf->umf_user_data_offset = pos - gxf->umf_start_offset;
-    put_le32(pb, 20);
-    put_le32(pb,  0);
-    put_le16(pb,  0);
-    put_le16(pb,  0);
-    put_le32(pb,  0);
-    put_byte(pb,  0);
-    put_byte(pb,  0);
-    put_byte(pb,  0);
-    put_byte(pb,  0);
-    return 20;
-}
-
 static int gxf_write_umf_packet(AVFormatContext *s)
 {
     GXFContext *gxf = s->priv_data;
@@ -603,7 +583,6 @@ static int gxf_write_umf_packet(AVFormatContext *s)
     gxf_write_umf_material_description(s);
     gxf->umf_track_size = gxf_write_umf_track_description(s);
     gxf->umf_media_size = gxf_write_umf_media_description(s);
-    gxf->umf_user_data_size = gxf_write_umf_user_data(s);
     gxf->umf_length = url_ftell(pb) - gxf->umf_start_offset;
     return updatePacketSize(pb, pos);
 }

tests/libav.regression.ref

@@ -27,8 +27,8 @@ af78858062599fcbba049e4a02588a15 *./tests/data/b-libav.mov
 913b6199765b1dcba196706574621c2f *./tests/data/b-libav.dv
 3600000 ./tests/data/b-libav.dv
 ./tests/data/b-libav.dv CRC=0x7787e173
-8441d11ebee0465f1a672586485f3506 *./tests/data/b-libav.gxf
-805996 ./tests/data/b-libav.gxf
+638d9af223b7cfc68202661d2cf10b38 *./tests/data/b-libav.gxf
+805976 ./tests/data/b-libav.gxf
 ./tests/data/b-libav.gxf CRC=0x9c06676e
 66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-libav.nut
 329264 ./tests/data/b-libav.nut