Merge commit '0940b748bdba36c4894fc8ea6be631d821fdf578'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:14:10 +0000 (17:14 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:16:39 +0000 (17:16 -0300)
* commit '0940b748bdba36c4894fc8ea6be631d821fdf578':
  qsvdec: Only warn about unconsumed data if it happens more than once

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/qsvdec.c
libavcodec/qsvdec.h

Simple merge
Simple merge