diff options
author | Yaowu Xu <yaowu@google.com> | 2014-10-06 09:40:15 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-06 09:40:15 -0700 |
commit | 04db245a2f98b6c1a53bd5c37a52e547b70da688 (patch) | |
tree | b990ecb650bf3c2958c262c1acdda309b8e97837 | |
parent | 1b8c57e915d3041974c66d3649da1e7cf8cb7aff (diff) | |
parent | 72ef1949388c4c0d82769ef06c6db0195b124b13 (diff) | |
download | libvpx-04db245a2f98b6c1a53bd5c37a52e547b70da688.tar libvpx-04db245a2f98b6c1a53bd5c37a52e547b70da688.tar.gz libvpx-04db245a2f98b6c1a53bd5c37a52e547b70da688.tar.bz2 libvpx-04db245a2f98b6c1a53bd5c37a52e547b70da688.zip |
Merge "Change the y4m buffer allocation size"
-rw-r--r-- | y4minput.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/y4minput.c b/y4minput.c index 34ea96d9d..eb08f0b23 100644 --- a/y4minput.c +++ b/y4minput.c @@ -975,9 +975,9 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip, + 2 * ((_y4m->pic_w + _y4m->dst_c_dec_h - 1) / _y4m->dst_c_dec_h) * ((_y4m->pic_h + _y4m->dst_c_dec_v - 1) / _y4m->dst_c_dec_v); if (_y4m->bit_depth == 8) - _y4m->dst_buf = (unsigned char *)malloc(_y4m->dst_buf_sz); + _y4m->dst_buf = (unsigned char *)malloc(_y4m->dst_buf_read_sz); else - _y4m->dst_buf = (unsigned char *)malloc(2 * _y4m->dst_buf_sz); + _y4m->dst_buf = (unsigned char *)malloc(2 * _y4m->dst_buf_read_sz); if (_y4m->aux_buf_sz > 0) _y4m->aux_buf = (unsigned char *)malloc(_y4m->aux_buf_sz); |