diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 20:59:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:00:40 +0200 |
| commit | 108e2ae8299a221e78c549a69c09a5eb1cebbd6c (patch) | |
| tree | 49d7c9772d07f0161735a88310c68145ea90262c /libavcodec/jpeglsdec.h | |
| parent | a6e782434a218a51b243c00c2b844b7abb4d4509 (diff) | |
| parent | 110796739ab32854dc0b6b0a1c95e6ae98889062 (diff) | |
| download | ffmpeg-108e2ae8299a221e78c549a69c09a5eb1cebbd6c.tar.gz | |
Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'
* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.h')
0 files changed, 0 insertions, 0 deletions