diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 14:36:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 14:36:55 +0100 |
| commit | 9ace154186d853f56f9e713c2fd67f92c851ec04 (patch) | |
| tree | e6a7af05ed6262e91e92abc8c636f2085ac87ba4 /configure | |
| parent | a067445b45fbf4519daf5551c0cb588120ad27ba (diff) | |
| parent | 99e20125232d40ea239a5b54d26bbfe526506114 (diff) | |
| download | ffmpeg-9ace154186d853f56f9e713c2fd67f92c851ec04.tar.gz | |
Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'
* commit '99e20125232d40ea239a5b54d26bbfe526506114':
x86/arm: Add clobber tests to libavresample
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -4639,7 +4639,8 @@ enabled neon_clobber_test && -Wl,--wrap,avcodec_decode_subtitle2 \ -Wl,--wrap,avcodec_encode_audio2 \ -Wl,--wrap,avcodec_encode_video2 \ - -Wl,--wrap,avcodec_encode_subtitle || + -Wl,--wrap,avcodec_encode_subtitle \ + -Wl,--wrap,avresample_convert || disable neon_clobber_test enabled xmm_clobber_test && @@ -4651,6 +4652,7 @@ enabled xmm_clobber_test && -Wl,--wrap,avcodec_encode_video \ -Wl,--wrap,avcodec_encode_video2 \ -Wl,--wrap,avcodec_encode_subtitle \ + -Wl,--wrap,avresample_convert \ -Wl,--wrap,sws_scale || disable xmm_clobber_test |