Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jun 2015 19:56:26 +0000 (21:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jun 2015 19:56:26 +0000 (21:56 +0200)
commit4ed3a01d717f120ba6881815ad6c40ad3f625825
tree22db0ca8a7b66a399221bbf955145d78e9ad8e11
parentefcf8cfa48c84676417d40689e63a37d5190a8ed
parent03ca6d70df192125a772dadd01acfe3905aa653f
Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'

* commit '03ca6d70df192125a772dadd01acfe3905aa653f':
  x264: Factor out the reconfiguration code

Conflicts:
libavcodec/libx264.c

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