Merge commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4'
authorMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 15:21:41 +0000 (15:21 +0000)
committerMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 15:21:41 +0000 (15:21 +0000)
commita7434ef19585f3af9ec168ec2db3db299f447285
tree08fb000fa6c323c34839d1e014414238c912f9e8
parent80fa5a0bcc13375711d9901f6ac7d8bdcc10a883
parent8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4
Merge commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4'

* commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4':
  qsvenc: print warnings from encode/init

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/qsv.c
libavcodec/qsv_internal.h
libavcodec/qsvenc.c