diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-28 22:07:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-28 22:07:34 +0200 |
| commit | ca7fa3a5167dc480917491bca4a1bc873d24125a (patch) | |
| tree | 71f6233924888e00e867321c136e780ddc66e075 /libavutil/opt.c | |
| parent | f2bc2e89548706beee056f40036fc571ea817b80 (diff) | |
| parent | 0426c6931070a65a7ec8362d12038ef10fa015ee (diff) | |
| download | ffmpeg-ca7fa3a5167dc480917491bca4a1bc873d24125a.tar.gz | |
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>
Diffstat (limited to 'libavutil/opt.c')
| -rw-r--r-- | libavutil/opt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 956edf5ce7..9d9cd1f485 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -81,7 +81,8 @@ static int read_number(const AVOption *o, void *dst, double *num, int *den, int6 static int write_number(void *obj, const AVOption *o, void *dst, double num, int den, int64_t intnum) { if (o->max*den < num*intnum || o->min*den > num*intnum) { - av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range\n", num*intnum/den, o->name); + av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range\n", + num*intnum/den, o->name); return AVERROR(ERANGE); } |