aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_alphamerge.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-01-31 14:56:11 -0300
committerJames Almer <jamrial@gmail.com>2017-01-31 14:56:11 -0300
commitf6005907fdeb9e4de37568ed5c1a8e7b869126f6 (patch)
tree1fdd8b0790cdf585404a95879448befde760d1f8 /libavfilter/vf_alphamerge.c
parent4d0e89ce27bc8d995bf9be831e62ea0b3893e375 (diff)
parent95c1df929b92d81454656c222a35ec5f7db576b4 (diff)
downloadffmpeg-f6005907fdeb9e4de37568ed5c1a8e7b869126f6.tar.gz
Merge commit '95c1df929b92d81454656c222a35ec5f7db576b4'
* commit '95c1df929b92d81454656c222a35ec5f7db576b4': x86: hpeldsp: Drop unused function parameters Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/vf_alphamerge.c')
0 files changed, 0 insertions, 0 deletions