Commit graph

2 commits

Author SHA1 Message Date
Michael Niedermayer
5d5f8b29b4 Merge commit 'f56d8d8dd7'
* commit 'f56d8d8dd7':
  h264: aarch64: intra prediction optimisations

Conflicts:
	libavcodec/h264pred.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 01:39:30 +02:00
Janne Grunau
f56d8d8dd7 h264: aarch64: intra prediction optimisations 2015-07-20 23:10:29 +02:00