diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 21:15:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 21:18:36 +0100 |
commit | a11440c1857babc2c1184b83c19b9e66c9a6fe95 (patch) | |
tree | b9ee0581b00d7f1fecd35f45076ee7deccc4fae9 /libavresample | |
parent | e71dce5769b2282824da7cfd6f7e4ce0d1985876 (diff) | |
parent | 93f7948136fcda8ddbbc44a6c24418f11ca829b8 (diff) | |
download | ffmpeg-a11440c1857babc2c1184b83c19b9e66c9a6fe95.tar.gz |
Merge commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8'
* commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8':
libvpx: Fix mixed use of av_malloc() and av_reallocp()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions