aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-21 01:39:30 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-21 01:39:30 +0200
commit5d5f8b29b4d4976f9f429b73a0bb562db028bfd0 (patch)
tree28163098d20fc733748436d7e66d52d58dd8e811 /doc
parent495eee01238b1282c6b61a021ee9fa5f42b6f108 (diff)
parentf56d8d8dd72b1ab52aa814c5a0fccabf8040ef68 (diff)
downloadffmpeg-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 'doc')
0 files changed, 0 insertions, 0 deletions