Skip to content
Snippets Groups Projects
Commit a8e96383 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'b5a13865' 


* 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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 8e970a58 b5a13865
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment