From 506e4bb8bc27b0b3fd099c27084b2f28081732b5 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Mon, 28 Jan 2008 18:33:27 +0000 Subject: [PATCH] cosmetics, vertically align Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/movenc.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index df41b6e..2196a17 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -497,19 +497,12 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) } 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); -- 2.7.4