[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

Michael Niedermayer git at videolan.org
Sat May 17 14:54:23 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 17 14:26:23 2014 +0200| [5b0c7052fb2cd0e0b736a6ac6ce382d7f5e0112a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b0c7052fb2cd0e0b736a6ac6ce382d7f5e0112a
---





More information about the ffmpeg-cvslog mailing list