[FFmpeg-cvslog] Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 16 10:14:00 2013 +0200| [a134f9676e4f7988d360b69e0aed176055c47bcb] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a134f9676e4f7988d360b69e0aed176055c47bcb
---