aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_volume.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-29 22:43:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-29 22:43:36 +0100
commitccccfb59b14ffbc2a6c1d402c8cae3cdf30f1a6e (patch)
tree102d556250573f0fe8f32c725b679c31d7f827a5 /libavfilter/af_volume.c
parent89c35b113060a00bc57ee67c5ebc29ea500d5160 (diff)
parent22b985d59c007c4422aefe3ef3fca0aa0daafa9f (diff)
downloadffmpeg-ccccfb59b14ffbc2a6c1d402c8cae3cdf30f1a6e.tar.gz
Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'
* commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f': hqdn3d: check memory allocations and propagate errors Conflicts: libavfilter/vf_hqdn3d.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_volume.c')
0 files changed, 0 insertions, 0 deletions