diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 11:14:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 11:21:45 +0200 |
| commit | 1a7ae6be2a8722d0a496acb11963e9540d7494d3 (patch) | |
| tree | 39a2f629f1159c1639d8b25e6e6cace7a952c0db /libswresample/resample.c | |
| parent | e119d1b345c1673f83f36050fc706233b1934ffe (diff) | |
| parent | 86113667c0fc6cded65b94fb57262da09c06594b (diff) | |
| download | ffmpeg-1a7ae6be2a8722d0a496acb11963e9540d7494d3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Include hpeldsp_neon.o if h264qpel is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample.c')
0 files changed, 0 insertions, 0 deletions