diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 17:51:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 17:52:46 +0200 |
| commit | efa1e26122e3ae68dfd1c4ff622aa2060d4a80c3 (patch) | |
| tree | 8f319b8915b10dc42a6b96f6b1e537cc6efd9852 | |
| parent | 8eff61fd45f1d1872c9f370bdf7e33501a3e6d7a (diff) | |
| parent | 083cbc930d077651ea7e3fbc32ec45352cfed7e7 (diff) | |
| download | ffmpeg-efa1e26122e3ae68dfd1c4ff622aa2060d4a80c3.tar.gz | |
Merge commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7'
* commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7':
snappy: Refactor so ff_snappy_uncompress() uses an existing buffer
Conflicts:
libavcodec/hapdec.c
libavcodec/snappy.c
See: 17ee24af7e5f7112fe25c734236d521f9e35d80d
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
0 files changed, 0 insertions, 0 deletions