ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu
Jul 23 17:51:40 2015 +0200| [efa1e26122e3ae68dfd1c4ff622aa2060d4a80c3] |
committer: Michael Niedermayer
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 <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efa1e26122e3ae68dfd1c4ff622aa2060d4a80c3
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
