[FFmpeg-cvslog] Merge commit 'e912b0777b24133df27836b6c529faa89af588dc' into release/2.2

Michael Niedermayer git at videolan.org
Sat Aug 23 02:58:24 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 23 02:47:33 2014 +0200| [459a84ada3b7e0bac3a0ea7360e83cc87f625d31] | committer: Michael Niedermayer

Merge commit 'e912b0777b24133df27836b6c529faa89af588dc' into release/2.2

* commit 'e912b0777b24133df27836b6c529faa89af588dc':
  proresenc: Report buffer overflow

Conflicts:
	libavcodec/proresenc_kostya.c

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

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





More information about the ffmpeg-cvslog mailing list