diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 22:34:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 22:34:22 +0200 |
| commit | 5cd2cdf33fcd5d6ce0485369e2506ccd9d8be4da (patch) | |
| tree | 2fa091ca30a54fc7d304241e4bb680ba28690033 /ffmpeg_filter.c | |
| parent | a5a6f6fec338112966d1bc21a52440c75831050f (diff) | |
| parent | 0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01 (diff) | |
| download | ffmpeg-5cd2cdf33fcd5d6ce0485369e2506ccd9d8be4da.tar.gz | |
Merge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2
* commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01':
ppc: Fix compilation for ppc64le (ELFv2)
aarch64: Use the correct syntax for relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions