[FFmpeg-cvslog] Merge commit '7a5a55722749a3ab77941914707277b147322cbe'

Michael Niedermayer git at videolan.org
Fri Sep 20 13:26:12 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 13:20:06 2013 +0200| [61a8eaf7119db509cbfc0b8c123f5c6baad78a32] | committer: Michael Niedermayer

Merge commit '7a5a55722749a3ab77941914707277b147322cbe'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61a8eaf7119db509cbfc0b8c123f5c6baad78a32
---





More information about the ffmpeg-cvslog mailing list