Mercurial > libavformat.hg

changeset 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
files movenc.c
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/movenc.c	Wed Mar 11 08:03:42 2009 +0000
+++ b/movenc.c	Wed Mar 11 08:04:44 2009 +0000
@@ -587,6 +587,11 @@
         else if (track->enc->codec_type == CODEC_TYPE_VIDEO) tag = MKTAG('m','p','4','v');
         else if (track->enc->codec_type == CODEC_TYPE_AUDIO) tag = MKTAG('m','p','4','a');
     } else if (track->mode == MODE_IPOD) {
+        if (track->enc->codec_type == CODEC_TYPE_SUBTITLE &&
+            (tag == MKTAG('t','x','3','g') ||
+             tag == MKTAG('t','e','x','t')))
+            track->tag = tag; // keep original tag
+        else
         tag = codec_get_tag(codec_ipod_tags, track->enc->codec_id);
         if (!match_ext(s->filename, "m4a") && !match_ext(s->filename, "m4v"))
             av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v "