diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 12:08:11 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 12:08:11 +0100 |
| commit | 8e9dfe0d298b34cfbcdc5d7cbd8daab513fbfce4 (patch) | |
| tree | 43e0bb52683eaca05716761490dbbfd4780cab6e /libavcodec/ppc | |
| parent | 7c54e5870f2c2fb095d03d670215e2183bfbfee9 (diff) | |
| parent | 468bfe38c66d4d020984158e53b09a6a5749f394 (diff) | |
Merge commit '468bfe38c66d4d020984158e53b09a6a5749f394'
* commit '468bfe38c66d4d020984158e53b09a6a5749f394':
ppc: mpegvideo: Add proper runtime AltiVec detection
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/ppc')
| -rw-r--r-- | libavcodec/ppc/mpegvideodsp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/ppc/mpegvideodsp.c b/libavcodec/ppc/mpegvideodsp.c index 7696954335..021933255b 100644 --- a/libavcodec/ppc/mpegvideodsp.c +++ b/libavcodec/ppc/mpegvideodsp.c @@ -20,7 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/cpu.h" #include "libavutil/mem.h" +#include "libavutil/ppc/cpu.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/mpegvideodsp.h" @@ -128,6 +130,9 @@ static void gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */, av_cold void ff_mpegvideodsp_init_ppc(MpegVideoDSPContext *c) { #if HAVE_ALTIVEC + if (!PPC_ALTIVEC(av_get_cpu_flags())) + return; + c->gmc1 = gmc1_altivec; #endif /* HAVE_ALTIVEC */ } |