Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mms: Remove non-utf8 characters
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/mms.c

 /*
  * MMS protocol common definitions.
  * Copyright (c) 2006,2007 Ryan Martell
- * Copyright (c) 2007 Bjrn Axelsson
+ * Copyright (c) 2007 Björn Axelsson
  * Copyright (c) 2010 Zhentan Feng <spyfeng at gmail dot com>
  *
  * This file is part of FFmpeg.

libavformat/mmst.c

 /*
  * MMS protocol over TCP
  * Copyright (c) 2006,2007 Ryan Martell
- * Copyright (c) 2007 Bjrn Axelsson
+ * Copyright (c) 2007 Björn Axelsson
  * Copyright (c) 2010 Zhentan Feng <spyfeng at gmail dot com>
  *
  * This file is part of FFmpeg.