* 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>