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)
commit9507f68deb664c19aceddcf1451f7237aae919c3
tree575564d03d2b00db333e42b7a4caa3375078302f
parentad53c94d8fe0c45c5b3807ea11428dcb01c66757
parent3b6473b43eb69fc3faaf69f7fd0b83b51db7607f
Merge commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f'

* commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f':
  qsvdec: properly handle the warning from MFXVideoCORE_SyncOperation

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