Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Dec 2013 12:24:10 +0000 (13:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Dec 2013 12:24:43 +0000 (13:24 +0100)
commit6b36f577a12a0e940b43984d442e1cca7e272b63
tree9af78400afc8b1c87d8fb2cc70219ade3425606a
parentcd355d4d59666383f7c1f5973a8d6be20623b622
parent1716b4c7b888a00380b36d3a49f725e6a243ed18
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mms: Remove non-utf8 characters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mms.c
libavformat/mmst.c