[FFmpeg-cvslog] Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  3 09:16:36 2013 +0200| [a8e963835a43e64311751b01f44707bd0e360d46] | committer: Michael Niedermayer

Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'

* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  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 at gmx.at>

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