Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Add dvd subtitle support

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/movenc.c
index ce90cdb1e0c40dedfe80785187da6b066211fb8b,a6a55d58fb0b34eabfb0cc0509e5a2c6724c25b7..3ec4983f023065e7800b2c39c27def5f71a26df8
--- 1/libavformat/movenc.c
--- 2/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@@ -1580,14 -1312,10 +1585,15 @@@ static int mov_write_hdlr_tag(AVIOConte
              hdlr_type = "soun";
              descr     = "SoundHandler";
          } else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) {
 +            if (track->tag == MKTAG('c','6','0','8')) {
 +                hdlr_type = "clcp";
 +                descr = "ClosedCaptionHandler";
 +            } else {
              if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
+             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',' ')) {
              hdlr_type = "hint";
              descr     = "HintHandler";