diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 20:57:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 20:57:55 +0100 |
| commit | b7c6ccc1e6a15a24734a3133ca2e0110e2b6cbbc (patch) | |
| tree | 54933dc752b1d6b217048cc8feaf7f5853e796ff /libavresample | |
| parent | 8c596864cd9512623eaf2cda90c50ffeb64bfc7a (diff) | |
| parent | d6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e (diff) | |
| download | ffmpeg-b7c6ccc1e6a15a24734a3133ca2e0110e2b6cbbc.tar.gz | |
Merge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e'
* commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e':
arm: Remove a stray .fpu directive
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions