Michael Niedermayer 6a24d77929 Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1' ...

* commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1':
  AVOptions: add flags for read/read-only options

Conflicts:
	libavutil/opt.c
	libavutil/opt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-02-20 02:01:13 +01:00

31 KiB

Raw Blame History

View Raw