diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 12:08:17 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 12:08:17 +0400 |
| commit | e77647c52863189508a4f995821f86ccb42a4b32 (patch) | |
| tree | d6034c4341b6af26cd07852ce3f470de268ac8c8 /libavfilter/vf_delogo.c | |
| parent | efc08e00cc0b05ea478aef51693199bfb0c3b489 (diff) | |
| parent | 7f83959598b6565baa0091e5739dd9091ab7a990 (diff) | |
Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990'
* commit '7f83959598b6565baa0091e5739dd9091ab7a990':
vf_crop: use the name 's' for the pointer to the private context
vf_boxblur: use the name 's' for the pointer to the private context
vf_blackframe: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_crop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_delogo.c')
0 files changed, 0 insertions, 0 deletions