Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 May 2012 20:07:34 +0000 (22:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 May 2012 20:07:34 +0000 (22:07 +0200)
commitca7fa3a5167dc480917491bca4a1bc873d24125a
tree71f6233924888e00e867321c136e780ddc66e075
parentf2bc2e89548706beee056f40036fc571ea817b80
parent0426c6931070a65a7ec8362d12038ef10fa015ee
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  AVOptions: fix the value printed in out of range error message.

Conflicts:
libavutil/opt.c

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