Mercurial > libavformat.hg

comparison movenc.c @ 2981:3c0b2165d82c libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spoke too fast, fix dv fourcc in mov accordingly if strict
author bcoudurier
date Mon, 28 Jan 2008 16:58:42 +0000
parents 672d72727b20
children a039456aa97d
comparison
equal deleted inserted replaced
2980:672d72727b20 2981:3c0b2165d82c
492 if (track->enc->codec_id == CODEC_ID_H264) tag = MKTAG('a','v','c','1'); 492 if (track->enc->codec_id == CODEC_ID_H264) tag = MKTAG('a','v','c','1');
493 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); 493 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
494 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); 494 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
495 } else if (track->mode == MODE_3GP || track->mode == MODE_3G2) { 495 } else if (track->mode == MODE_3GP || track->mode == MODE_3G2) {
496 tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id); 496 tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id);
497 } else if (!tag) { // do not override tag for mov 497 } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
498 tag == MKTAG('d','v','c','p'))) {
498 if (track->enc->codec_id == CODEC_ID_DVVIDEO) { 499 if (track->enc->codec_id == CODEC_ID_DVVIDEO) {
499 if (track->enc->height == 480) { /* NTSC */ 500 if (track->enc->height == 480) { /* NTSC */
500 if (track->enc->pix_fmt == PIX_FMT_YUV422P) 501 if (track->enc->pix_fmt == PIX_FMT_YUV422P)
501 tag = MKTAG('d', 'v', '5', 'n'); 502 tag = MKTAG('d', 'v', '5', 'n');
502 else 503 else