diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-18 15:06:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-18 15:40:53 +0100 |
| commit | 1355cafcb675e773713bce8606001bc67a2b2cb5 (patch) | |
| tree | 771f7b7690b7d9219ba529a7a49bd4df419a1f7d /libavformat/wvenc.c | |
| parent | 469de4f58317e121644c4cf9a2824ccbbf7763ca (diff) | |
| parent | e535897fad2c4e26e2e50eba66935c8dd8010669 (diff) | |
| download | ffmpeg-1355cafcb675e773713bce8606001bc67a2b2cb5.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix libswresample compilation with Apple Neon assembler.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wvenc.c')
0 files changed, 0 insertions, 0 deletions