Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 17:48:51 +0000 (18:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 17:48:51 +0000 (18:48 +0100)
commitad4963a944644d390a813755ded833ba4a2ca367
tree57b0e196784d6de0d423d3dc4bb0a992f784f29b
parent5640ea43d7202e6bc6bc032079f66456323d1008
parent0120e480bf0a1257299c8c84416a8814ccfcc73b
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@gmx.at>
libavcodec/arm/asm.S
libavcodec/arm/dsputil_armv6.S
libavcodec/lagarith.c
libavcodec/lagarithrac.h