Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Apr 2014 01:07:49 +0000 (03:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Apr 2014 01:08:25 +0000 (03:08 +0200)
commit072278c777986fc87dba5b0c372e19115b711a35
treea91e483f8830986ea72c949cc7dbfdca2a746e29
parent190106e884a28a661251e72ced6177ecc7774bda
parent5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1
Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'

* commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1':
  libxvid: add working lumimasking and variance AQ

Conflicts:
libavcodec/libxvid.c
libavcodec/version.h

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