* commit '0c1d66a07917602303f129f5a5651faeec2415d5': avconv_vaapi: fix double-free with some unsupported streams Merged-by: Clément Bœsch <u@pkh.me>
* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f': avconv: VAAPI hwcontext initialisation and hwaccel helper Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>