Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 21:10:14 +0000 (23:10 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 21:10:14 +0000 (23:10 +0200)
commitef2a85ac532117b13087f3ceabeb450f12d26c7e
tree6dae7f787d02ac09694a5bc8062eb18e6eca0621
parentc105e0f077fb988d5c19e1a1beadf839f01e1a3e
parentaa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d
Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'

* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
  qsvdec: avoid an infinite loop with no consumed data and no output

Conflicts:
libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qsvdec.c