diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-23 04:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-23 04:29:51 +0200 |
| commit | 01a73d6cef70dfa90fdf79f7afd55b817b4c9342 (patch) | |
| tree | 6439c123a8368d7e2830d90d7b47725c5efe5f1c /libavutil/opt.c | |
| parent | 0753721ed1caab048b58db15ebfdf45569e83420 (diff) | |
| parent | a121754852a69b4879a39ba78863404c13c54f61 (diff) | |
| download | ffmpeg-01a73d6cef70dfa90fdf79f7afd55b817b4c9342.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffmpeg: Don't trigger url_interrupt_cb on the first signal
avoptions: Check the return value from av_get_number
dct32_sse: eliminate some spills
Fix dct32() compilation with --disable-yasm
Conflicts:
ffmpeg.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 5976c3377e..c38004fdd2 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -313,7 +313,8 @@ int64_t av_get_int(void *obj, const char *name, const AVOption **o_out) double num=1; int den=1; - av_get_number(obj, name, o_out, &num, &den, &intnum); + if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0) + return -1; return num*intnum/den; } |