highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetics, vertically align

Browse Source 
Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2008-01-28 18:33:27 +00:00
parent dd670dedf9
commit 506e4bb8bc
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/movenc.c
View File

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