Changeset c8a441ef in ffmpeg

Timestamp:

Dec 19, 2011, 11:15:06 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0edf7ebc

Parents:

b08a742 (diff), 708df4ac (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/19/11 23:14:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/19/11 23:15:06)

Message:

Merge remote-tracking branch 'cus/stable'

• cus/stable: ffplay: remove global video state

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

(No files)