Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:43:52 +0000 (22:43 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:43:52 +0000 (22:43 +0100)
commitb975aeec02e4518a4e5f2996cf51d113e42e1727
tree2a2db1597eb4a20f4ad9f7be56d3992bbcfb8448
parent508957fd0fc398271f3ec87cde63ba4533678bf9
parent2c62fcdf5d617791a653d7957d449f75569eede0
Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'

* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
  lavc: VAAPI H.264 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/vaapi_encode_h264.c
libavcodec/vaapi_encode_h26x.c
libavcodec/vaapi_encode_h26x.h
libavcodec/version.h