diff options
author | James Almer <jamrial@gmail.com> | 2017-12-27 21:05:11 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-12-27 21:05:11 -0300 |
commit | aa6f43c2e959a960792f76d006b8699d733f258f (patch) | |
tree | 9c0c88a6cea8feaadea501b289a40a92dbb983f9 /libavcodec/arm/me_cmp_armv6.S | |
parent | fa2d28567e3514323c440c4b7935a3d711eded8d (diff) | |
parent | 2beba58e0e4bda688bf96e12413231607ceafdd4 (diff) | |
download | ffmpeg-aa6f43c2e959a960792f76d006b8699d733f258f.tar.gz |
Merge commit '2beba58e0e4bda688bf96e12413231607ceafdd4'
* commit '2beba58e0e4bda688bf96e12413231607ceafdd4':
mmaldec: Fix compilation after 2fcb0090
This commit is a noop, see 758fbc54fef2f31957b5c5f22e05e5fd9b04f631
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm/me_cmp_armv6.S')
0 files changed, 0 insertions, 0 deletions