[FFmpeg-cvslog] Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 11:26:48 2013 +0100| [f0e43e60cd09bf68b4d6e6ab9b56f690b61ee068] | committer: Michael Niedermayer

Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'

* commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3':
  AVOptions: do not range check flag options.

Conflicts:
	libavutil/opt.c

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

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