Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 23:12:03 +0000 (00:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 23:15:28 +0000 (00:15 +0100)
commit86316039ab06bcf5c8b9c14f535f1dd072990e3b
tree932ffc4715b5fcbefd99e60dceaef84f9bad00d4
parentc3204856331b9c34bf7c4fd83527c5065e4cdd7e
parent50ea93158d4c480f64069e8bd1da388486dcf4ba
Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'

* commit '50ea93158d4c480f64069e8bd1da388486dcf4ba':
  Add libx265 encoder

Conflicts:
Changelog
LICENSE
configure
libavcodec/allcodecs.c
libavcodec/libx265.c
libavcodec/version.h

See: bb6b1731eba2fac424ff8ad3003fe58b308debd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libx265.c
libavcodec/version.h