Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'
authorClément Bœsch <u@pkh.me>
Sat, 18 Mar 2017 18:22:30 +0000 (19:22 +0100)
committerClément Bœsch <u@pkh.me>
Sat, 18 Mar 2017 18:22:30 +0000 (19:22 +0100)
commit53587ca48280626d007599e3e29c85d021b6997a
treea65a79fb24ab00aefe0e8a1379bd9166e9ea1c74
parent824d4062a172bd435fea7cbf8d6b55583c73e70e
parentec021d48445a414325ad59a73f9cde3212b173e4
Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'

* commit 'ec021d48445a414325ad59a73f9cde3212b173e4':
  buffer: fix av_buffer_pool_init2() documentation

Merged-by: Clément Bœsch <u@pkh.me>
libavutil/buffer.h