aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/x86/vf_gradfun.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-16 15:21:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-16 15:21:31 +0200
commite55092b12b572e53b3970ca261e9205ae4cabcb0 (patch)
tree3806ddf57afcebf59653e215b022c81172de6df1 /libavfilter/x86/vf_gradfun.c
parentafec02afe7e8d001c84b066383e0d72b79c25225 (diff)
parentf6b6d6ac42c0ee427fcd3fae4c398b2103b491b8 (diff)
downloadffmpeg-e55092b12b572e53b3970ca261e9205ae4cabcb0.tar.gz
Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'
* commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8': vf_frei0r: use the name 's' for the pointer to the private context vf_format: use the name 's' for the pointer to the private context vf_fieldorder: use the name 's' for the pointer to the private context vf_fieldorder: cosmetics, remove an extra linebreak Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86/vf_gradfun.c')
0 files changed, 0 insertions, 0 deletions