aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_mergeplanes.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-01-31 14:49:29 -0300
committerJames Almer <jamrial@gmail.com>2017-01-31 14:49:29 -0300
commitca8a3978e57c7c8f6abab8547f47483e407469b7 (patch)
tree35b56bd181dce5761c5b085ee5e9647917ce118b /libavfilter/vf_mergeplanes.c
parent481884080977f15854fe06e1c742a7741e49555c (diff)
parent1dfc3cf89d0eb026af28be46294b85d79499ffb5 (diff)
downloadffmpeg-ca8a3978e57c7c8f6abab8547f47483e407469b7.tar.gz
Merge commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5'
* commit '1dfc3cf89d0eb026af28be46294b85d79499ffb5': x86: hpeldsp: Split off VP3-specific bits into a separate file Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
0 files changed, 0 insertions, 0 deletions