Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov: Prevent segfaults on mov_write_hdlr_tag

Conflicts:
	libavformat/movenc.c

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

diff --cc libavformat/movenc.c
index 5b7046801474b9360b8b8e15ed4ca21a12b7fe77,b83b0c09e2890abb3344ce2aba3d288ed5b40e57..d0f663bb62c78f82800dbd7e030aed81034fe31d
--- 1/libavformat/movenc.c
--- 2/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@@ -1450,10 -1255,6 +1450,7 @@@ static int mov_write_hdlr_tag(AVIOConte
              if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
              else                                      hdlr_type = "text";
              descr = "SubtitleHandler";
-         } else if (track->enc->codec_tag == MKTAG('t','m','c','d')) {
-             hdlr_type = "tmcd";
-             descr = "TimeCodeHandler";
 +            }
          } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) {
              hdlr_type = "hint";
              descr     = "HintHandler";