[FFmpeg-cvslog] Merge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct 16 23:00:11 2015 +0200| [ba94e985a33d8e0feb545b09854e711a331c5343] | committer: Hendrik Leppkes

Merge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'

* commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea':
  fate: Move screenpresso to the appropriate screen capture file

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

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