Merge commit '37a9015ee84c15fec5247ba8f6577351a25fa8d2'
authorMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 15:04:45 +0000 (15:04 +0000)
committerMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 15:04:45 +0000 (15:04 +0000)
* commit '37a9015ee84c15fec5247ba8f6577351a25fa8d2':
  qsvenc: add support for p010

Merged-by: Mark Thompson <sw@jkqxz.net>
1  2 
libavcodec/qsvenc.c
libavcodec/qsvenc_h264.c
libavcodec/qsvenc_hevc.c

Simple merge
Simple merge
Simple merge