[FFmpeg-cvslog] Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 20 02:01:13 2014 +0100| [6a24d77929e0d5425c79a081034719ac68199602] | committer: Michael Niedermayer

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 at gmx.at>

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