virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  mov: Unbreak sbtl writing

Conflicts:
	libavformat/movenc.c

See: 8a9d0a1561
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-31 22:08:11 +02:00
parent 0f714abb49 f94371b1db
commit 9d013fe840
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/movenc.c
+7 -3
View File
@@ -1589,9 +1589,13 @@ static int mov_write_hdlr_tag(AVIOContext *pb, MOVTrack *track)
hdlr_type = "clcp";
descr = "ClosedCaptionHandler";
} else {
if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
else if (track->tag == MKTAG('m','p','4','s')) hdlr_type = "subp";
else hdlr_type = "text";
if (track->tag == MKTAG('t','x','3','g')) {
hdlr_type = "sbtl";
} else if (track->tag == MKTAG('m','p','4','s')) {
hdlr_type = "subp";
} else {
hdlr_type = "text";
}
descr = "SubtitleHandler";
}
} else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) {