diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 01:39:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 01:39:30 +0200 |
| commit | 5d5f8b29b4d4976f9f429b73a0bb562db028bfd0 (patch) | |
| tree | 28163098d20fc733748436d7e66d52d58dd8e811 /libavcodec/h264pred.c | |
| parent | 495eee01238b1282c6b61a021ee9fa5f42b6f108 (diff) | |
| parent | f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68 (diff) | |
| download | ffmpeg-streaming-5d5f8b29b4d4976f9f429b73a0bb562db028bfd0.zip ffmpeg-streaming-5d5f8b29b4d4976f9f429b73a0bb562db028bfd0.tar.gz | |
Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'
* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68':
h264: aarch64: intra prediction optimisations
Conflicts:
libavcodec/h264pred.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264pred.c')
| -rw-r--r-- | libavcodec/h264pred.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 497b080..8f15f71 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -592,7 +592,12 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, break; } - if (ARCH_ARM) ff_h264_pred_init_arm(h, codec_id, bit_depth, chroma_format_idc); - if (ARCH_X86) ff_h264_pred_init_x86(h, codec_id, bit_depth, chroma_format_idc); - if (ARCH_MIPS) ff_h264_pred_init_mips(h, codec_id, bit_depth, chroma_format_idc); + if (ARCH_AARCH64) + ff_h264_pred_init_aarch64(h, codec_id, bit_depth, chroma_format_idc); + if (ARCH_ARM) + ff_h264_pred_init_arm(h, codec_id, bit_depth, chroma_format_idc); + if (ARCH_X86) + ff_h264_pred_init_x86(h, codec_id, bit_depth, chroma_format_idc); + if (ARCH_MIPS) + ff_h264_pred_init_mips(h, codec_id, bit_depth, chroma_format_idc); } |
