aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mxfenc.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-31 06:49:42 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-31 06:49:42 +0000
commit221ef8ca384f659056eb384d6ea26b18e8abb477 (patch)
tree248cdb589a3eb9871f88ca4bc7eea77374a8caab /libavformat/mxfenc.c
parent383dde71f7f29183aa7b3601724d412ac860742b (diff)
downloadffmpeg-221ef8ca384f659056eb384d6ea26b18e8abb477.tar.gz
local tag 3201 is picture essence coding, so do not write it for wav
Originally committed as revision 16892 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mxfenc.c')
-rw-r--r--libavformat/mxfenc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 5ac4041680..cf3472d43a 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -570,9 +570,6 @@ static void mxf_write_generic_desc(ByteIOContext *pb, AVStream *st, const UID ke
mxf_write_local_tag(pb, 16, 0x3004);
put_buffer(pb, mxf_essence_container_uls[sc->index].container_ul, 16);
-
- mxf_write_local_tag(pb, 16, 0x3201);
- put_buffer(pb, *sc->codec_ul, 16);
}
static const UID mxf_mpegvideo_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x51,0x00 };
@@ -601,13 +598,16 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
mxf_write_local_tag(pb, 8, 0x320E);
put_be32(pb, dar.num);
put_be32(pb, dar.den);
+
+ mxf_write_local_tag(pb, 16, 0x3201);
+ put_buffer(pb, *sc->codec_ul, 16);
}
static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st)
{
ByteIOContext *pb = s->pb;
- mxf_write_generic_desc(pb, st, mxf_wav_descriptor_key, 108);
+ mxf_write_generic_desc(pb, st, mxf_wav_descriptor_key, 88);
// write audio sampling rate
mxf_write_local_tag(pb, 8, 0x3D03);