Changeset 5b0c7052 in ffmpeg

Timestamp:

May 17, 2014, 12:26:29 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a7320c15

Parents:

11e49033 (diff), a583e2b (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> (05/17/14 12:26:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/17/14 12:26:29)

Message:

Merge remote-tracking branch 'cus/stable'

• cus/stable: ffplay: add support for toggling between multiple video filters with the w key ffplay: fix typo in docs ffplay: try multiple sample rates if audio open fails cmdutils: replace usages of "#ifdef MINGW32" with "#ifdef _WIN32" because MSVC only defines _WIN32 ffplay: fix compilation with Visual Studio ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04

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

(No files)