Merge commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 15:51:40 +0000 (17:51 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 15:52:46 +0000 (17:52 +0200)
* 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>

Trivial merge