Changeset e206b51f in ffmpeg

Timestamp:

Mar 28, 2012, 12:16:56 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e4cc9f30

Parents:

a0340dfb (diff), e6093e36 (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> (03/28/12 00:16:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/28/12 00:16:56)

Message:

Merge remote-tracking branch 'cus/stable'

• cus/stable: ffplay: pause rdft column when ffplay is paused

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

(No files)