Skip to content

F
ffmpeg-mt
Commit 7a7c1bc8 authored by bcoudurier's avatar bcoudurier
Browse files
Options

cosmetics, vertically align 

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11655 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d7a1e590
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 13 deletions
libavformat/movenc.c
View file @ 7a7c1bc8
...@@ -497,19 +497,12 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) ...@@ -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 && } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
tag == MKTAG('d','v','c','p'))) { tag == MKTAG('d','v','c','p'))) {
if (track->enc->codec_id == CODEC_ID_DVVIDEO) { if (track->enc->codec_id == CODEC_ID_DVVIDEO) {
if (track->enc->height == 480) { /* NTSC */ if (track->enc->height == 480) /* NTSC */
if (track->enc->pix_fmt == PIX_FMT_YUV422P) if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n');
tag = MKTAG('d', 'v', '5', 'n'); else tag = MKTAG('d','v','c',' ');
else else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p');
tag = MKTAG('d', 'v', 'c', ' '); else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p');
} else { /* assume PAL */ else tag = MKTAG('d','v','p','p');
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 { } else {
if (track->enc->codec_type == CODEC_TYPE_VIDEO) { if (track->enc->codec_type == CODEC_TYPE_VIDEO) {
tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id); tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id);
......
Markdown is supported
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