Changeset 1986380d in ffmpeg

Timestamp:

Jun 21, 2011, 7:55:55 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Children:

3fedb3e6

Parents:

df3850db (diff), 86824c1d (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> (06/21/11 19:55:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/21/11 19:55:55)

Message:

Merge branch 'master' into oldabi

• master: ffplay: do not init SDL audio if -an is specified. Fix zero-length gnu_printf format string warning. A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead.

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

(No files)