Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:40:42 +0000 (22:40 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:41:12 +0000 (22:41 +0100)
commit508957fd0fc398271f3ec87cde63ba4533678bf9
treea700524a0ab24500780eb1b8388e7b596be3fdad
parent172d3568b38c6d0c872293bbffa947a43a8d86ec
parent104c804bcaac24b52eb51ed17df2fb311e6ae73e
Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'

* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e':
  lavc: VAAPI encode common infrastructure

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
configure
libavcodec/Makefile
libavcodec/vaapi_encode.c
libavcodec/vaapi_encode.h