Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:16:36 +0000 (09:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:16:36 +0000 (09:16 +0200)
commita8e963835a43e64311751b01f44707bd0e360d46
tree3b21d37293b3765a70ae195dc61fd6984e3b69d9
parent8e970a58614fe15565d5849c933f17b9ec138647
parentb5a138652ff8a5b987d3e1191e67fd9f6575527e
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@gmx.at>
doc/print_options.c
libavcodec/options.c
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options.c
libavformat/options_table.h
libavutil/opt.h
libswscale/options.c