Skip to content
Snippets Groups Projects
Commit 8ed82d81 authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

do not write f2 if not interlaced 

Originally committed as revision 16929 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cbd70c41
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 4 deletions
libavformat/mxfenc.c
+ 5
− 4
View file @ 8ed82d81
...@@ -620,9 +620,6 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) ...@@ -620,9 +620,6 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
put_byte(pb, sc->interlaced); put_byte(pb, sc->interlaced);
// video line map // video line map
mxf_write_local_tag(pb, 16, 0x320D);
put_be32(pb, 2);
put_be32(pb, 4);
switch (st->codec->height) { switch (st->codec->height) {
case 576: f1 = 23; f2 = 336; break; case 576: f1 = 23; f2 = 336; break;
case 608: f1 = 7; f2 = 320; break; case 608: f1 = 7; f2 = 320; break;
...@@ -638,8 +635,12 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) ...@@ -638,8 +635,12 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st)
f1 *= 2; 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, f1);
put_be32(pb, f2); if (sc->interlaced)
put_be32(pb, f2);
av_reduce(&dar.num, &dar.den, av_reduce(&dar.num, &dar.den,
st->codec->width*st->codec->sample_aspect_ratio.num, st->codec->width*st->codec->sample_aspect_ratio.num,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment