]> git.sesse.net Git - ffmpeg/commit - libavutil/mem.c
Merge commit 'b4b27dce95a6d40bfcd78043d3abec7d80dae143'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 19:07:59 +0000 (16:07 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 19:07:59 +0000 (16:07 -0300)
commitb8eb0827f053230dd919bc73e25381b47b4fe1a7
tree9c3ccf20557a7d9cdace18931a18b3f525972c1b
parent398000abcf980d239a789da6f69811913d2fc635
parentb4b27dce95a6d40bfcd78043d3abec7d80dae143
Merge commit 'b4b27dce95a6d40bfcd78043d3abec7d80dae143'

* commit 'b4b27dce95a6d40bfcd78043d3abec7d80dae143':
  aarch64: vp8: Move the vp8dsp makefile entries to the right places
  aarch64: vp8: Remove superfluous includes

This commit is a noop, see
fecf75a5c4f691d1e786992cf1dfa82e76ac1b97
c8bc9d1380dd686a4ee97d3415c976707904e945

Merged-by: James Almer <jamrial@gmail.com>