Merge commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2015-07-23 17:51:40 +02:00

parent 8eff61fd45 083cbc930d

commit efa1e26122

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available