summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-31 06:46:42 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-01-31 06:46:42 +0000
commit383dde71f7f29183aa7b3601724d412ac860742b (patch)
tree45c03858ddc1e1bc4f69df27d329796d3606b2f7
parent959005883a681b8a9634541d434f3100e9b23d9d (diff)
stored height is stupidly /2 if interlaced
Originally committed as revision 16891 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 95ee847550..5ac4041680 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -580,6 +580,7 @@ static const UID mxf_wav_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,
static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
{
+ MXFStreamContext *sc = st->priv_data;
ByteIOContext *pb = s->pb;
int stored_height = (st->codec->height+15)/16*16;
AVRational dar;
@@ -590,7 +591,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, stored_height);
+ put_be32(pb, stored_height>>sc->interlaced);
av_reduce(&dar.num, &dar.den,
st->codec->width*st->codec->sample_aspect_ratio.num,