diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 03:19:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 03:20:23 +0200 |
| commit | a7a82f2f22afaac9155ef46b8ff274ad4573b20e (patch) | |
| tree | f31420f2363aaf23a8ff355c21bd147dc46f4a57 /libavcodec/h264.c | |
| parent | 072278c777986fc87dba5b0c372e19115b711a35 (diff) | |
| parent | c389a804943095ebf078daec6b64690d2c97069c (diff) | |
Merge commit 'c389a804943095ebf078daec6b64690d2c97069c'
* commit 'c389a804943095ebf078daec6b64690d2c97069c':
libxvid: Add SSIM displaying through a libxvidcore plugin
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
See: 3b3c1ed0768af874c624cc555fbbd1fcea370200
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
0 files changed, 0 insertions, 0 deletions