]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '559370f2c45110afd8308eec7194437736c323d4'
authorMark Thompson <sw@jkqxz.net>
Thu, 25 Jan 2018 22:50:38 +0000 (22:50 +0000)
committerMark Thompson <sw@jkqxz.net>
Thu, 25 Jan 2018 22:50:38 +0000 (22:50 +0000)
* commit '559370f2c45110afd8308eec7194437736c323d4':
  qsv: Skip the packet if decoding failure

Merged-by: Mark Thompson <sw@jkqxz.net>
1  2 
libavcodec/qsvdec_h2645.c

Simple merge