Merge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 22:55:48 +0000 (00:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 23:19:57 +0000 (01:19 +0200)
commit8159fe255ccadbb81c52f192f48d9dc6fc3e5537
tree62bbb36bf8813e184afc106e904d3f72409c5122
parent508e7a5c16c93ae3df31d79b7e808cb7bc893b52
parent2f4170312f605c1f02a14c01347e94cf46726dbd
Merge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'

* commit '2f4170312f605c1f02a14c01347e94cf46726dbd':
  libx264: Support bitrate reconfiguration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libx264.c