Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 23:20:55 +0000 (01:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 23:21:39 +0000 (01:21 +0200)
commit49f1b869b60f27ac450f3db301b46d56e5d5aca6
tree9d55eb8807eb7f006348de0c59fe44afe678d413
parent32365667ccebab599eabf5f99ed0cdea20d29750
parent0ef256d51518f0e483c38b9ee3b993cf0709d00e
Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'

* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
  libx264: Correctly manage constant rate factor params

Conflicts:
libavcodec/libx264.c

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