Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 May 2013 08:14:00 +0000 (10:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 May 2013 08:14:00 +0000 (10:14 +0200)
commita134f9676e4f7988d360b69e0aed176055c47bcb
tree6add5d612f09d99ab5e4041711b14e591f36f5bf
parente77647c52863189508a4f995821f86ccb42a4b32
parentba09675f44612fad9f7169f71b8276beb50a0dcd
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>
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c