Changeset 9042c8a4 in ffmpeg

Timestamp:

Jul 21, 2013, 4:03:27 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f9f7f4c9

Parents:

118a1c2f (diff), b198e33a (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/21/13 16:03:21)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/21/13 16:03:27)

Message:

Merge remote-tracking branch 'cus/stable'

• cus/stable: ffplay: fix build with disabled avfilter

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

(No files)