Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 21:43:36 +0000 (22:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 21:43:36 +0000 (22:43 +0100)
commitccccfb59b14ffbc2a6c1d402c8cae3cdf30f1a6e
tree102d556250573f0fe8f32c725b679c31d7f827a5
parent89c35b113060a00bc57ee67c5ebc29ea500d5160
parent22b985d59c007c4422aefe3ef3fca0aa0daafa9f
Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'

* commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f':
  hqdn3d: check memory allocations and propagate errors

Conflicts:
libavfilter/vf_hqdn3d.c

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