diff options
author | James Almer <jamrial@gmail.com> | 2017-03-23 18:28:56 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-23 18:28:56 -0300 |
commit | c97e986e90c3f9719b6ba8409744ecdf21a63cf1 (patch) | |
tree | fb395ee51f051576b7de5baf4d68977b8c2aeac3 /libavcodec/sipr.h | |
parent | 0dcfa02fd2788f243b8ae123467f3fbfd6587591 (diff) | |
parent | 7911186ed616ae81dd8617d6d0e8b08c818db9d8 (diff) | |
download | ffmpeg-c97e986e90c3f9719b6ba8409744ecdf21a63cf1.tar.gz |
Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'
* commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8':
emms: Give apriv_emms_yasm() a more general name
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/sipr.h')
0 files changed, 0 insertions, 0 deletions