Merge remote-tracking branch 'qatar/master'

* qatar/master: mms: Remove non-utf8 characters Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 6b36f577a1
parent cd355d4d59 1716b4c7b8
commit 6b36f577a1
2 changed files with 2 additions and 2 deletions
--- a/libavformat/mms.c
+++ b/libavformat/mms.c
@ -1,7 +1,7 @@
 /*
 * 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 FFmpeg.
--- a/libavformat/mmst.c
+++ b/libavformat/mmst.c
@ -1,7 +1,7 @@
 /*
 * 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 FFmpeg.