diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 10:14:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 10:14:00 +0200 |
| commit | a134f9676e4f7988d360b69e0aed176055c47bcb (patch) | |
| tree | 6add5d612f09d99ab5e4041711b14e591f36f5bf /doc/swresample.txt | |
| parent | e77647c52863189508a4f995821f86ccb42a4b32 (diff) | |
| parent | ba09675f44612fad9f7169f71b8276beb50a0dcd (diff) | |
| download | ffmpeg-a134f9676e4f7988d360b69e0aed176055c47bcb.tar.gz | |
Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'
* commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd':
vf_delogo: use the name 's' for the pointer to the private context
vf_cropdetect: use the name 's' for the pointer to the private context
vf_crop: cosmetics, break lines
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/swresample.txt')
0 files changed, 0 insertions, 0 deletions