Browse Source

Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
6b36f577a1
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libavformat/mms.c
  2. +1
    -1
      libavformat/mmst.c

+ 1
- 1
libavformat/mms.c View File

@@ -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.


+ 1
- 1
libavformat/mmst.c View File

@@ -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.


Loading…
Cancel
Save