Changeset 1bf22c3a in ffmpeg

Timestamp:

Jun 2, 2012, 3:06:09 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

03095d73, b3675f89

Parents:

fb4e434c (diff), f1a75aa0 (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> (06/02/12 15:06:02)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/02/12 15:06:09)

Message:

Merge remote-tracking branch 'cus/stable'

• cus/stable: ffplay: remove VideoPicture pix_fmt and use frame pixel format instead ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8 ffplay: add pause audio feature in the middle of a packet ffplay: remove VideoPicture duration field

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

(No files)