mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-27 09:20:14 +01:00
* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68': h264: aarch64: intra prediction optimisations Conflicts: libavcodec/h264pred.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>