diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 22:07:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 22:08:11 +0200 |
| commit | 9d013fe840213407790592ca8ecbab69285030ed (patch) | |
| tree | a08f85752a848c8dd65946429986b23e5633ebfd | |
| parent | 0f714abb49850fd43be207dc8c5a4bfab5a1999e (diff) | |
| parent | f94371b1db89bf65173a763a49175ce549466602 (diff) | |
| download | ffmpeg-9d013fe840213407790592ca8ecbab69285030ed.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov: Unbreak sbtl writing
Conflicts:
libavformat/movenc.c
See: 8a9d0a1561470a185a3d09676fcf9b44830a4bfe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index da533e1cec..14065ede36 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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',' ')) { |