Changeset c6959918 in ffmpeg

Timestamp:

Dec 7, 2013, 3:11:25 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d042c825

Parents:

e8ac905d (diff), ad01fae8 (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/07/13 15:11:22)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/07/13 15:11:25)

Message:

Merge remote-tracking branch 'cus/stable'

• cus/stable: ffplay: set default window size before starting audio ffplay: factor out function setting default window size ffplay: remove no longer necessary codec flush ffplay: do not wait for flushing the picture queue on flush packet

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

(No files)