[FFmpeg-cvslog] Merge commit '3c5cf2a31b4b29a8e4282cbe6a3f0617c14698b8'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Oct 27 14:05:41 2015 +0100| [564eabeebb1e4239d0ff19a5a93ff9757ebbec70] | committer: Hendrik Leppkes

Merge commit '3c5cf2a31b4b29a8e4282cbe6a3f0617c14698b8'

* commit '3c5cf2a31b4b29a8e4282cbe6a3f0617c14698b8':
  screenpresso: Drop parameter change check

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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