Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 10:48:52 +0000 (12:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 10:48:52 +0000 (12:48 +0200)
commitfb679d53743f3beed3ccb998c428c8b601cec59e
tree290fda459e006965cc989b745615fb824f3aacb2
parenteec75e0a1fc952d5ca31de8f5c8d934cfa52edf2
parent67400f6b6219892ab7a555fb61ef979c857692d7
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>
libavformat/movenc.c