]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '5584abf69d83169a010aca404cd1cf95c23ad9ef':
  arm: Emit .thumb_func directives

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

Simple merge