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)
* commit '2f4170312f605c1f02a14c01347e94cf46726dbd':
  libx264: Support bitrate reconfiguration

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

Simple merge