diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:31:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:31:24 +0200 |
| commit | 9bdb254b980fef48bead17197a2821ca06509301 (patch) | |
| tree | f3ae4a4d63a36bc551df04fba518fb0a57629448 /libavutil/parseutils.c | |
| parent | 358d1f6e01e0e9b6e3fac632a40ca9e286b6011a (diff) | |
| parent | 1bd6372cd34935815c0a061adbf3bc68ca68ff73 (diff) | |
| download | ffmpeg-9bdb254b980fef48bead17197a2821ca06509301.tar.gz | |
Merge commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73' into release/2.2
* commit '1bd6372cd34935815c0a061adbf3bc68ca68ff73':
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions