Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 01:01:13 +0000 (02:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 01:01:13 +0000 (02:01 +0100)
commit6a24d77929e0d5425c79a081034719ac68199602
tree5300b75b67ae1494e494333730e4234a16562839
parentf4c8d002231afbc181e97c512e459ec6860f7098
parentc3ecd968f0e78da6e77f0c06c2f785b266d83cf1
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>
doc/APIchanges
libavutil/opt.c
libavutil/opt.h
libavutil/version.h