]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a'
authorJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 18:48:17 +0000 (15:48 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 18:48:17 +0000 (15:48 -0300)
* commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a':
  arm: Produce .const_data instead of .section .rodata for Mach-O

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

Simple merge