[FFmpeg-cvslog] Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 16 10:33:31 2013 +0200| [04dd5ddedad384669d531e4b334888e8d8888d54] | committer: Michael Niedermayer

Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'

* commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68':
  vf_fade: use the name 's' for the pointer to the private context
  vf_drawtext: use the name 's' for the pointer to the private context
  vf_drawbox: use the name 's' for the pointer to the private context

Conflicts:
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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