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)
* commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53':
  qsvenc: properly handle the warning from MFXVideoCORE_SyncOperation

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

Simple merge