[SCM] libav/experimental: write essence elements klv packets with ber4 length, more interoperable

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:37:54 UTC 2013


The following commit has been merged in the experimental branch:
commit e15421fe2bc50463eda278e1986a6d4b900e54fa
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri Feb 13 07:06:35 2009 +0000

    write essence elements klv packets with ber4 length, more interoperable
    
    Originally committed as revision 17200 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index d551609..0810960 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1397,7 +1397,7 @@ static void mxf_write_system_item(AVFormatContext *s)
 
     // write system metadata pack
     put_buffer(pb, system_metadata_pack_key, 16);
-    klv_encode_ber_length(pb, 57);
+    klv_encode_ber4_length(pb, 57);
     put_byte(pb, 0x5c); // UL, user date/time stamp, picture and sound item present
     put_byte(pb, 0x04); // content package rate
     put_byte(pb, 0x00); // content package type
@@ -1419,7 +1419,7 @@ static void mxf_write_system_item(AVFormatContext *s)
 
     // write system metadata package set
     put_buffer(pb, system_metadata_package_set_key, 16);
-    klv_encode_ber_length(pb, 35);
+    klv_encode_ber4_length(pb, 35);
     put_byte(pb, 0x83); // UMID
     put_be16(pb, 0x20);
     mxf_write_umid(pb, SourcePackage, 0);
@@ -1479,7 +1479,7 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt)
 
     mxf_write_klv_fill(s);
     put_buffer(pb, sc->track_essence_element_key, 16); // write key
-    klv_encode_ber_length(pb, pkt->size); // write length
+    klv_encode_ber4_length(pb, pkt->size); // write length
     put_buffer(pb, pkt->data, pkt->size); // write value
 
     put_flush_packet(pb);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list