Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 02:11:58 +0000 (03:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 02:11:58 +0000 (03:11 +0100)
commit85a685ac0af4594475c444b4ef80c383696123da
treec0cbb0e2c61ef1f6dbf2d9c24d57989430125a03
parentbd593a98dc41256fd753924c5cb404f86610cf01
parent1e7f825a9b212f838cf6df74da70d33113919dbf
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  hqdn3d: Fix out of array read in LOWPASS
  vf_gradfun: fix uninitialized variable use

Conflicts:
libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c