[FFmpeg-cvslog] Merge commit '7cb9296db872c4221453e5411f242ebcfca62664'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Sep 28 13:21:34 2017 -0300| [983705cf137be209f2f83c0351d1c170471cbbdf] | committer: James Almer

Merge commit '7cb9296db872c4221453e5411f242ebcfca62664'

* commit '7cb9296db872c4221453e5411f242ebcfca62664':
  webp: Fix alpha decoding

This commit is a noop.

[13:09:40] <jamrial> jkqxz: do we need 7cb9296db8 from libav?
[13:11:20] <+wm4> we had vaapi vp8 for a while in ffmpeg, so I guess not
[13:11:58] <@jkqxz> It's more fallout from the VP8 hwaccel which never got merged. Some people hated on that part of the patch and I wasn't really interested in pursuing it further.
[13:13:02] <jamrial> it wasn't merged?
[13:13:21] <@jkqxz> wm4:  There is no VP8 decode hwaccel in ffmpeg (there is encode).
[13:13:25] <+wm4> ah
[13:14:00] <jamrial> what do i do then? and shouldn't that be merged at some point?
[13:14:37] <@jkqxz> It should.
[13:14:53] <@jkqxz> Skip the patch now, though.
[13:16:30] <jamrial> ok, thanks

Merged-by: James Almer <jamrial at gmail.com>

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