code cleanup.
Merge branch 'master' of github.com:bavc/FFmpeg

Conflicts:
	libavfilter/vf_values.c