[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

Michael Niedermayer git at videolan.org
Mon Mar 10 18:51:57 CET 2014


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 10 18:48:51 2014 +0100| [ad4963a944644d390a813755ded833ba4a2ca367] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8:
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
  arm: hpeldsp: prevent overreads in armv6 asm
  lagarith: reallocate rgb_planes when needed
  lagarith: avoid infinite loop in lag_rac_refill()

Conflicts:
	libavcodec/lagarith.c

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

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





More information about the ffmpeg-cvslog mailing list