diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:02:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:02:36 +0100 |
| commit | 27e6b4a3ffecf01a199366ea456ce62dc7f44da2 (patch) | |
| tree | 967befed100749ba32e83afede9ea9cb3e138303 /libavcodec/jpeglsenc.c | |
| parent | b82860caa7d8cfa2a1ca663422b3c966185d6c1d (diff) | |
| parent | 23af29e8825ac112877b9ac0572ef11e5f0539f2 (diff) | |
| download | ffmpeg-27e6b4a3ffecf01a199366ea456ce62dc7f44da2.tar.gz | |
Merge commit '23af29e8825ac112877b9ac0572ef11e5f0539f2' into release/2.2
* commit '23af29e8825ac112877b9ac0572ef11e5f0539f2':
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsenc.c')
0 files changed, 0 insertions, 0 deletions