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)
commit04e4ab44d7c5eca9e1929b34d8fb966afc403e3a
tree4417e00efdccb603f831985d9f7b1a1e3939174c
parentb855b570c811d208bfadeb4e140bee90c1598e72
parent559370f2c45110afd8308eec7194437736c323d4
Merge commit '559370f2c45110afd8308eec7194437736c323d4'

* commit '559370f2c45110afd8308eec7194437736c323d4':
  qsv: Skip the packet if decoding failure

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