[FFmpeg-cvslog] Merge commit '278a923c51187d37445d88a6b21082036ec9568d'

Michael Niedermayer git at videolan.org
Wed Jul 3 14:20:32 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 13:57:59 2013 +0200| [f0358dc1d30cd4f4862489ab95c4d408b00a8b0d] | committer: Michael Niedermayer

Merge commit '278a923c51187d37445d88a6b21082036ec9568d'

* commit '278a923c51187d37445d88a6b21082036ec9568d':
  jpeg2000: Validate SIZ parsing

Conflicts:
	libavcodec/jpeg2000dec.c

This commit is not exactly merged due to bugs in it

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list