generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not write f2 if not interlaced

Browse Source 
Originally committed as revision 16929 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-02-02 03:49:23 +00:00
parent cbd70c4100
commit 8ed82d8174
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mxfenc.c
View File

@ -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)
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,