Changeset 84006072 in ffmpeg

Timestamp:

Jul 30, 2011, 10:34:47 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b39f872a

Parents:

3b5ddf07 (diff), 8a54bfe8 (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> (07/30/11 22:34:34)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/30/11 22:34:47)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: build: make examples build normally

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

(No files)