diff options
author | James Almer <jamrial@gmail.com> | 2017-10-11 19:44:56 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-11 19:44:56 -0300 |
commit | 37caed777472256f0bb817adf1c5b8d9f59d85ae (patch) | |
tree | 918cbf641592592a43ec9edbf2600ba128f768b9 /libavformat/qcp.c | |
parent | ef7766befde5f2f10c00517094d7153578a9aa94 (diff) | |
parent | aba5b94859ef1cb8f517dc64bce86a3021316ae8 (diff) | |
download | ffmpeg-37caed777472256f0bb817adf1c5b8d9f59d85ae.tar.gz |
Merge commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8'
* commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8':
Add Apple Pixlet decoder
libavutil: add av_mod_uintp2
intmath: add faster clz support
This commit is a noop, see
0dd8a3d71e2c01d42e868d6c6b8974fadfcc529e
d13e521cc861e791545dd6022fbf93f821e33618
73651090ca1183f37753ee30a7e206ca4fb9f4f0
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/qcp.c')
0 files changed, 0 insertions, 0 deletions