diff options
author | James Almer <jamrial@gmail.com> | 2017-03-23 18:31:36 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-23 18:31:36 -0300 |
commit | 0d34473d8ecd2aec69229aa076e94977a3f45394 (patch) | |
tree | e3d757b24dbe3c7e8ef6534a7e6a252ea67be0bb /libavformat/srtp.h | |
parent | c97e986e90c3f9719b6ba8409744ecdf21a63cf1 (diff) | |
parent | dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b (diff) | |
download | ffmpeg-0d34473d8ecd2aec69229aa076e94977a3f45394.tar.gz |
Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'
* commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b':
checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/srtp.h')
0 files changed, 0 insertions, 0 deletions