Mercurial > libavformat.hg

comparison movenc.c @ 4702:09002ac05a8c libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keep original tag when stream copying subs with ipod format
author bcoudurier
date Wed, 11 Mar 2009 08:04:44 +0000
parents 337071cd70b6
children 901ceeb9ab2d
comparison
equal deleted inserted replaced
4701:337071cd70b6 4702:09002ac05a8c
585 else if (track->enc->codec_id == CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c'); 585 else if (track->enc->codec_id == CODEC_ID_DIRAC) tag = MKTAG('d','r','a','c');
586 else if (track->enc->codec_id == CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g'); 586 else if (track->enc->codec_id == CODEC_ID_MOV_TEXT) tag = MKTAG('t','x','3','g');
587 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); 587 else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
588 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); 588 else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
589 } else if (track->mode == MODE_IPOD) { 589 } else if (track->mode == MODE_IPOD) {
590 if (track->enc->codec_type == CODEC_TYPE_SUBTITLE &&
591 (tag == MKTAG('t','x','3','g') ||
592 tag == MKTAG('t','e','x','t')))
593 track->tag = tag; // keep original tag
594 else
590 tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id); 595 tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id);
591 if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v")) 596 if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v"))
592 av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v " 597 av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v "
593 "Quicktime/Ipod might not play the file\n"); 598 "Quicktime/Ipod might not play the file\n");
594 } else if (track->mode & MODE_3GP) { 599 } else if (track->mode & MODE_3GP) {