diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 14:26:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 14:26:29 +0200 |
| commit | 5b0c7052fb2cd0e0b736a6ac6ce382d7f5e0112a (patch) | |
| tree | aedbe852aeca7e1fbc121269f452a2c552aa89b4 /libavcodec/wmaenc.c | |
| parent | 11e490334e0d5839ae40468960a14a964a09af3a (diff) | |
| parent | a583e2bebe7746f7a68aede707ec3eebfd908659 (diff) | |
| download | ffmpeg-5b0c7052fb2cd0e0b736a6ac6ce382d7f5e0112a.tar.gz | |
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>
Diffstat (limited to 'libavcodec/wmaenc.c')
0 files changed, 0 insertions, 0 deletions