* commit '7a5a5572':
  qpeg: Add checks for running out of rows in qpeg_decode_inter

Conflicts:
	libavcodec/qpeg.c

See: 4299dfa5Merged-by: Michael Niedermayer <michaelni@gmx.at>