Merge remote-tracking branch 'qatar/master'

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

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

diff --cc libavformat/mms.c
index 46fbede,fb16a3c..7e60b3b
--- 1/libavformat/mms.c
--- 2/libavformat/mms.c
+++ b/libavformat/mms.c
@@@ -1,12 -1,12 +1,12 @@@
  /*
   * MMS protocol common definitions.
   * Copyright (c) 2006,2007 Ryan Martell
-  * Copyright (c) 2007 Björn Axelsson
+  * Copyright (c) 2007 Björn Axelsson
   * Copyright (c) 2010 Zhentan Feng <spyfeng at gmail dot com>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavformat/mmst.c
index 3828955,4f896e0..ebef3ef
--- 1/libavformat/mmst.c
--- 2/libavformat/mmst.c
+++ b/libavformat/mmst.c
@@@ -1,12 -1,12 +1,12 @@@
  /*
   * MMS protocol over TCP
   * Copyright (c) 2006,2007 Ryan Martell
-  * Copyright (c) 2007 Björn Axelsson
+  * Copyright (c) 2007 Björn Axelsson
   * Copyright (c) 2010 Zhentan Feng <spyfeng at gmail dot com>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.