-
Michael Niedermayer authored
* commit 'aa9d15d8': qsvdec: avoid an infinite loop with no consumed data and no output Conflicts: libavcodec/qsvdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
ef2a85ac
* commit 'aa9d15d8': qsvdec: avoid an infinite loop with no consumed data and no output Conflicts: libavcodec/qsvdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>