Merge commit '2ecfd451649c7a08cb633635df98e59f7c6e2140'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jun 2015 18:46:35 +0000 (20:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jun 2015 18:47:21 +0000 (20:47 +0200)
commit9e5b0f070b690ce5b217970d4eb9cdf7ef6696e5
tree04dbd3b2d012706ee13f97d86ded80d827db5d58
parentf6276842f38d0511a2d2ab4bb7f5b47b195c8de1
parent2ecfd451649c7a08cb633635df98e59f7c6e2140
Merge commit '2ecfd451649c7a08cb633635df98e59f7c6e2140'

* commit '2ecfd451649c7a08cb633635df98e59f7c6e2140':
  Implement Snappy decompression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/snappy.c
libavcodec/snappy.h