diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-11 08:04:44 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-11 08:04:44 +0000 |
| commit | 7943a90a0d6674e6cb3202fbe032b6e07ed13d0f (patch) | |
| tree | 4ca072321acdb294b976925dd40d6be8a5c013dd /libavformat | |
| parent | c569bd063203e76337ff5b19e20463afe2ce54aa (diff) | |
| download | ffmpeg-7943a90a0d6674e6cb3202fbe032b6e07ed13d0f.tar.gz | |
keep original tag when stream copying subs with ipod format
Originally committed as revision 17939 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 85da3d6bb0..991452f9ee 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -587,6 +587,11 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) 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 " |