Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:45:39 +0000 (22:45 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:45:39 +0000 (22:45 +0100)
commita82d1a8c7a4b313a8d41334acbbb767c530c8e26
treedefd0e5a1d633a7bcf3fd14f5c66d3172feac698
parentb975aeec02e4518a4e5f2996cf51d113e42e1727
parent31fe1f2577f8208f79a4b3ab59465e78dd497555
Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'

* commit '31fe1f2577f8208f79a4b3ab59465e78dd497555':
  lavc: VAAPI H.265 encoder

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