# HG changeset patch # User bcoudurier # Date 1201545207 0 # Node ID a039456aa97d2382e69bf7986fb2e9ae1d17499f # Parent 3c0b2165d82c1bf8cfaeaa589265150b7698bd62 cosmetics, vertically align diff -r 3c0b2165d82c -r a039456aa97d movenc.c --- a/movenc.c Mon Jan 28 16:58:42 2008 +0000 +++ b/movenc.c Mon Jan 28 18:33:27 2008 +0000 @@ -497,19 +497,12 @@ } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && tag == MKTAG('d','v','c','p'))) { if (track->enc->codec_id == CODEC_ID_DVVIDEO) { - if (track->enc->height == 480) { /* NTSC */ - if (track->enc->pix_fmt == PIX_FMT_YUV422P) - tag = MKTAG('d', 'v', '5', 'n'); - else - tag = MKTAG('d', 'v', 'c', ' '); - } else { /* assume PAL */ - if (track->enc->pix_fmt == PIX_FMT_YUV422P) - tag = MKTAG('d', 'v', '5', 'p'); - else if (track->enc->pix_fmt == PIX_FMT_YUV420P) - tag = MKTAG('d', 'v', 'c', 'p'); - else - tag = MKTAG('d', 'v', 'p', 'p'); - } + if (track->enc->height == 480) /* NTSC */ + if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n'); + else tag = MKTAG('d','v','c',' '); + else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p'); + else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p'); + else tag = MKTAG('d','v','p','p'); } else { if (track->enc->codec_type == CODEC_TYPE_VIDEO) { tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);