[FFmpeg-cvslog] Merge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'

Michael Niedermayer git at videolan.org
Thu Mar 5 19:52:06 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  5 19:41:10 2015 +0100| [31559723ab453ea12953c7f1d4024717dfff6c6e] | committer: Michael Niedermayer

Merge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'

* commit '66624ed6319cb1a959256fe1a717fec5b748fbfa':
  rv10: check size of s->mb_width * s->mb_height

Conflicts:
	libavcodec/rv10enc.c

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

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





More information about the ffmpeg-cvslog mailing list