summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-28 18:33:27 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-28 18:33:27 +0000
commit506e4bb8bc27b0b3fd099c27084b2f28081732b5 (patch)
treeea7984bc1fed818bd476ef1ebaacbb856feae7c8 /libavformat
parentdd670dedf995763099bed52a81850a93c2625049 (diff)
cosmetics, vertically align
Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index df41b6e96e..2196a17720 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);