Merge commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:43:03 +0000 (08:43 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:43:03 +0000 (08:43 +0100)
commitb5513441e477f63e9627ce6eb7c4cad475a4ba35
tree36c7c1f6143cc0d4961207c6a6f8d43926478a9b
parent7dae3461c0bbd15e0765f29c33d2eb40566b9562
parenta6259a6ecbad18d58085e4ab23f56151e98d7b53
Merge commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53'

* commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53':
  qsvenc: properly handle the warning from MFXVideoCORE_SyncOperation

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