diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-02-02 03:49:23 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-02-02 03:49:23 +0000 |
| commit | 8ed82d8174a666f80ab8834e3617cbe91ae740a9 (patch) | |
| tree | 9b8a672026a6f48a2ae6a55fdd7ff1e88778bd4d /libavformat | |
| parent | cbd70c4100510f2bf859a69834f1dc56b220baf3 (diff) | |
do not write f2 if not interlaced
Originally committed as revision 16929 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxfenc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 13b125a028..4b5348854d 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -620,9 +620,6 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) put_byte(pb, sc->interlaced); // video line map - mxf_write_local_tag(pb, 16, 0x320D); - put_be32(pb, 2); - put_be32(pb, 4); switch (st->codec->height) { case 576: f1 = 23; f2 = 336; break; case 608: f1 = 7; f2 = 320; break; @@ -638,8 +635,12 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) f1 *= 2; } + mxf_write_local_tag(pb, 16, 0x320D); + put_be32(pb, sc->interlaced ? 2 : 1); + put_be32(pb, 4); put_be32(pb, f1); - put_be32(pb, f2); + if (sc->interlaced) + put_be32(pb, f2); av_reduce(&dar.num, &dar.den, st->codec->width*st->codec->sample_aspect_ratio.num, |