Merge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:44:43 +0000 (15:44 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:44:43 +0000 (15:44 +0200)
* commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84':
  vaapi_h264: Add trivial support for low-power encoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/vaapi_encode_h264.c

Simple merge