diff options
| author | wm4 <wm4@nowhere> | 2012-10-12 10:17:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-12 11:53:53 +0200 |
| commit | 85d185441acf4691c830db2f40235ac927410d45 (patch) | |
| tree | 211177793cd5d6b399346be661af8e7528f0f411 /mpcommon.h | |
| parent | 65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff) | |
| parent | e1b15dee4c250bf6509594e241eb2856c8d21e0f (diff) | |
| download | mpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2 mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz | |
Merge branch 'input_changes' into master
Conflicts:
DOCS/man/en/vo.rst
etc/input.conf
input/input.c
m_property.c
Diffstat (limited to 'mpcommon.h')
| -rw-r--r-- | mpcommon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mpcommon.h b/mpcommon.h index 472a2e1943..674d9b1554 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -41,7 +41,7 @@ do { \ size_t nextidx_ = (nextidx); \ size_t nelems_ = MP_TALLOC_ELEMS(p); \ - if (nextidx_ <= nelems_) \ + if (nextidx_ >= nelems_) \ p = talloc_realloc_size((ctx), p, \ (nextidx_ + 1) * sizeof((p)[0]) * 2);\ } while (0) |