Michael Niedermayer
authored
* commit 'f56d8d8d': h264: aarch64: intra prediction optimisations Conflicts: libavcodec/h264pred.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>
* commit 'f56d8d8d': h264: aarch64: intra prediction optimisations Conflicts: libavcodec/h264pred.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>