diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-26 13:24:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-26 13:24:43 +0100 |
| commit | 6b36f577a12a0e940b43984d442e1cca7e272b63 (patch) | |
| tree | 9af78400afc8b1c87d8fb2cc70219ade3425606a | |
| parent | cd355d4d59666383f7c1f5973a8d6be20623b622 (diff) | |
| parent | 1716b4c7b888a00380b36d3a49f725e6a243ed18 (diff) | |
| download | ffmpeg-6b36f577a12a0e940b43984d442e1cca7e272b63.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mms: Remove non-utf8 characters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mms.c | 2 | ||||
| -rw-r--r-- | libavformat/mmst.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mms.c b/libavformat/mms.c index 46fbede90c..7e60b3bec6 100644 --- 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. diff --git a/libavformat/mmst.c b/libavformat/mmst.c index 382895566e..ebef3ef098 100644 --- 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. |