Merge commit '7a5a55722749a3ab77941914707277b147322cbe'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 11:20:06 +0000 (13:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 11:20:06 +0000 (13:20 +0200)
* commit '7a5a55722749a3ab77941914707277b147322cbe':
  qpeg: Add checks for running out of rows in qpeg_decode_inter

Conflicts:
libavcodec/qpeg.c

See: 4299dfa5ded84111231a456ad102f65f6f62649e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/qpeg.c

Simple merge