Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 10:26:48 +0000 (11:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 10:26:48 +0000 (11:26 +0100)
commitf0e43e60cd09bf68b4d6e6ab9b56f690b61ee068
tree38d2c6aad84acda9240bcfffdd7f96e0a7ef2d92
parentac3fa95e73e52179c52cb0f117c06cdbaced6893
parent0b357a8095e72b092cc5c2aacc2f806db75ecae3
Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'

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

Conflicts:
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/opt.c