[FFmpeg-cvslog] Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 16 10:08:17 2013 +0200| [e77647c52863189508a4f995821f86ccb42a4b32] | committer: Michael Niedermayer

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

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