* commit 'b5a13865':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>