Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/51/head
Michael Niedermayer 11 years ago
commit 6b36f577a1
  1. 2
      libavformat/mms.c
  2. 2
      libavformat/mmst.c

@ -1,7 +1,7 @@
/* /*
* MMS protocol common definitions. * MMS protocol common definitions.
* Copyright (c) 2006,2007 Ryan Martell * 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> * Copyright (c) 2010 Zhentan Feng <spyfeng at gmail dot com>
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

@ -1,7 +1,7 @@
/* /*
* MMS protocol over TCP * MMS protocol over TCP
* Copyright (c) 2006,2007 Ryan Martell * 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> * Copyright (c) 2010 Zhentan Feng <spyfeng at gmail dot com>
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.

Loading…
Cancel
Save