diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 03:07:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 03:08:25 +0200 |
| commit | 072278c777986fc87dba5b0c372e19115b711a35 (patch) | |
| tree | a91e483f8830986ea72c949cc7dbfdca2a746e29 /libavcodec/h261_parser.c | |
| parent | 190106e884a28a661251e72ced6177ecc7774bda (diff) | |
| parent | 5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1 (diff) | |
| download | ffmpeg-072278c777986fc87dba5b0c372e19115b711a35.tar.gz | |
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>
Diffstat (limited to 'libavcodec/h261_parser.c')
0 files changed, 0 insertions, 0 deletions