Merge commit '5b145290df2998a9836a93eb925289c6c8b63af0'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:19:38 +0000 (22:19 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 22:19:38 +0000 (22:19 +0000)
commitd23fff0d8a0e7df170c67a9dd5c1f7c1fc0da489
tree3b51fe6fabeae2eea7cd5027f58c01d965bb5d45
parentd401ba6b3d86091dff2fae326c610f0120ee8853
parent5b145290df2998a9836a93eb925289c6c8b63af0
Merge commit '5b145290df2998a9836a93eb925289c6c8b63af0'

* commit '5b145290df2998a9836a93eb925289c6c8b63af0':
  lavc: Add support for increasing hardware frame pool sizes

Merged-by: Mark Thompson <sw@jkqxz.net>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/decode.c
libavcodec/options_table.h
libavcodec/version.h