Michael Niedermayer 61a8eaf711 Merge commit '7a5a55722749a3ab77941914707277b147322cbe' ...

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

Conflicts:
	libavcodec/qpeg.c

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

2013-09-20 13:20:06 +02:00

11 KiB

Raw Blame History

View Raw