aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_mergeplanes.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-09 12:38:44 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-09 12:38:44 +0100
commite48f2847aba795ac62dcc2aea7c176eb2833c168 (patch)
treeea34e926fc796ce29ac022cf12119c568e01a221 /libavfilter/vf_mergeplanes.c
parent71c63e799f3aedeab00538714caf7c7023b3ca2b (diff)
parentf74f4a540151aacb38306f2e41a160c326be3d51 (diff)
downloadffmpeg-e48f2847aba795ac62dcc2aea7c176eb2833c168.tar.gz
Merge commit 'f74f4a540151aacb38306f2e41a160c326be3d51' into release/2.2
* commit 'f74f4a540151aacb38306f2e41a160c326be3d51': Prepare for 10.6 Release Conflicts: RELEASE Not merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
0 files changed, 0 insertions, 0 deletions