Merge commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 4 Jan 2016 10:31:43 +0000 (11:31 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 4 Jan 2016 10:31:43 +0000 (11:31 +0100)
* commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f':
  qsvdec: properly handle the warning from MFXVideoCORE_SyncOperation

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

Simple merge