diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 17:00:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 17:03:52 +0200 |
| commit | af00d68af0f0bb18be0979a274e6e666360130f5 (patch) | |
| tree | 71cda577c3b564fc02e064ce2cfd39be2d361289 /libavcodec/sparc/vis.h | |
| parent | df003cbb565575fe539b06105b76a95db72e8720 (diff) | |
| parent | 3062ac4c47b18305aa55788133b4c8aaded12f11 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_pad: use the name 's' for the pointer to the private context
vf_overlay: use the name 's' for the pointer to the private context
vf_lut: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sparc/vis.h')
0 files changed, 0 insertions, 0 deletions