Changeset 6b36f577 in ffmpeg

Timestamp:

Dec 26, 2013, 12:24:43 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ec73bd1f

Parents:

cd355d4d (diff), 1716b4c7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/26/13 12:24:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/26/13 12:24:43)

Message:

Merge remote-tracking branch 'qatar/master'

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

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

(No files)