]> git.sesse.net Git - ffmpeg/commit - libavfilter/vf_psnr.c
Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'
authorJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 16:51:30 +0000 (13:51 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 16:51:30 +0000 (13:51 -0300)
commitb2f32d60eeaf883bb7d9e1b8cc2fb9a983d08f72
treedf224875431a88946ab85c676ca3f57e8795564b
parent22b6e1011caa9102fafcb4d120792c772c554ba9
parent5584abf69d83169a010aca404cd1cf95c23ad9ef
Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'

* commit '5584abf69d83169a010aca404cd1cf95c23ad9ef':
  arm: Emit .thumb_func directives

Merged-by: James Almer <jamrial@gmail.com>
libavutil/arm/asm.S