summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-23 20:15:46 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-23 20:15:46 +0000
commit24d6a613e015a9d3dc0ce5a61cda210208c0eb24 (patch)
treed2f08104c1186177aa906ba11d97d5d405b03802
parente9338da87d7cea7e2f7be27e1b9ac8997ead4ed9 (diff)
stored height is a multiple of 16 for mpeg2
Originally committed as revision 16731 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mxfenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 58cdeefb89..10f22d5113 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -557,6 +557,7 @@ static const UID mxf_wav_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,
static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
{
ByteIOContext *pb = s->pb;
+ int stored_height = (st->codec->height+15)/16*16;
mxf_write_generic_desc(pb, st, mxf_mpegvideo_descriptor_key);
@@ -564,7 +565,7 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
put_be32(pb, st->codec->width);
mxf_write_local_tag(pb, 4, 0x3202);
- put_be32(pb, st->codec->height);
+ put_be32(pb, stored_height);
mxf_write_local_tag(pb, 8, 0x320E);
put_be32(pb, st->codec->height * st->sample_aspect_ratio.den);