Merge commit '851960f6f8cf1f946fe42fa36cf6598fac68072c'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:25:01 +0000 (08:25 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:25:01 +0000 (08:25 +0100)
commit518961bc99b9eb802c5fa08b068edb9fe96a28be
treed829c41c625bd881a7c07e174bc038d44e840c67
parent464fcc979c502b0b19aab2c4fafd23613dfa5025
parent851960f6f8cf1f946fe42fa36cf6598fac68072c
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@pkh.me>