]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: df003cb 3062ac4)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 May 2013 15:00:10 +0000 (17:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 May 2013 15:03:52 +0000 (17:03 +0200)
commitaf00d68af0f0bb18be0979a274e6e666360130f5
tree71cda577c3b564fc02e064ce2cfd39be2d361289tree | snapshot
parentdf003cbb565575fe539b06105b76a95db72e8720commit | diff
parent3062ac4c47b18305aa55788133b4c8aaded12f11commit | 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>
libavfilter/vf_lut.c diff1 | diff2 | blob | history
libavfilter/vf_overlay.c diff1 | diff2 | blob | history
libavfilter/vf_pad.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.