[FFmpeg-cvslog] Merge commit '851960f6f8cf1f946fe42fa36cf6598fac68072c'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 08:25:01 2017 +0100| [518961bc99b9eb802c5fa08b068edb9fe96a28be] | committer: Clément Bœsch

Merge commit '851960f6f8cf1f946fe42fa36cf6598fac68072c'

* commit '851960f6f8cf1f946fe42fa36cf6598fac68072c':
  lavc: Remove old vaapi decode infrastructure
  avconv_vaapi: Convert to use hw_frames_ctx only
  vaapi_mpeg4: Convert to use the new VAAPI hwaccel code
  vaapi_vc1: Convert to use the new VAAPI hwaccel code
  vaapi_mpeg2: Convert to use the new VAAPI hwaccel code
  vaapi_h264: Convert to use the new VAAPI hwaccel code
  lavc: Rewrite VAAPI decode infrastructure

This merge is a noop, these commits have already been cherry-picked.

Merged-by: Clément Bœsch <u at pkh.me>

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