[FFmpeg-cvslog] Merge commit '7c55fac7dfa8bad9644dea5d03309da30be69563'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Nov 14 10:02:33 2016 +0100| [8ef6ba69c7f2010383eac12d5a7f2e24238ac10e] | committer: Hendrik Leppkes

Merge commit '7c55fac7dfa8bad9644dea5d03309da30be69563'

* commit '7c55fac7dfa8bad9644dea5d03309da30be69563':
  fate: Add test for webp

Noop, we already have a variety of webp tests, including a fate-webp target,
which would collide with this test.

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

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