summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-31 06:44:25 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-31 06:44:25 +0000
commit959005883a681b8a9634541d434f3100e9b23d9d (patch)
tree1f2991d9903550fcba8ebf5c32b10c0d00e11579 /libavformat
parent52e5cd2b1056a95a1b96147d27002aad2a2f692b (diff)
add size param to write_generic_desc
Originally committed as revision 16890 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mxfenc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index b2de458df3..95ee847550 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -551,12 +551,12 @@ static void mxf_write_multi_descriptor(AVFormatContext *s)
mxf_write_uuid(pb, SubDescriptor, i);
}
-static void mxf_write_generic_desc(ByteIOContext *pb, AVStream *st, const UID key)
+static void mxf_write_generic_desc(ByteIOContext *pb, AVStream *st, const UID key, unsigned size)
{
MXFStreamContext *sc = st->priv_data;
put_buffer(pb, key, 16);
- klv_encode_ber_length(pb, 108);
+ klv_encode_ber_length(pb, size);
mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, SubDescriptor, st->index);
@@ -584,7 +584,7 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
int stored_height = (st->codec->height+15)/16*16;
AVRational dar;
- mxf_write_generic_desc(pb, st, mxf_mpegvideo_descriptor_key);
+ mxf_write_generic_desc(pb, st, mxf_mpegvideo_descriptor_key, 108);
mxf_write_local_tag(pb, 4, 0x3203);
put_be32(pb, st->codec->width);
@@ -606,7 +606,7 @@ static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st)
{
ByteIOContext *pb = s->pb;
- mxf_write_generic_desc(pb, st, mxf_wav_descriptor_key);
+ mxf_write_generic_desc(pb, st, mxf_wav_descriptor_key, 108);
// write audio sampling rate
mxf_write_local_tag(pb, 8, 0x3D03);