[FFmpeg-cvslog] Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'

Michael Niedermayer git at videolan.org
Tue Jul 21 01:47:50 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 21 01:39:30 2015 +0200| [5d5f8b29b4d4976f9f429b73a0bb562db028bfd0] | committer: Michael Niedermayer

Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'

* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68':
  h264: aarch64: intra prediction optimisations

Conflicts:
	libavcodec/h264pred.c

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d5f8b29b4d4976f9f429b73a0bb562db028bfd0
---





More information about the ffmpeg-cvslog mailing list