[FFmpeg-cvslog] Merge commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Jan 19 08:43:03 2016 +0100| [b5513441e477f63e9627ce6eb7c4cad475a4ba35] | committer: Hendrik Leppkes

Merge commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5513441e477f63e9627ce6eb7c4cad475a4ba35
---