diff options
author | James Almer <jamrial@gmail.com> | 2017-11-08 13:45:09 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-11-08 13:45:09 -0300 |
commit | 1926f13a206bfbd99abf536e7424e2b321f2e2ad (patch) | |
tree | a13838e5728599f13f4152fe0bee18092e6a2b9c /Makefile | |
parent | 51f977c2c4b39d80ed39107a21b1647abce1acca (diff) | |
parent | 2fd6e7d077f590e4d7195356f9baeb271f8b9ae2 (diff) | |
download | ffmpeg-1926f13a206bfbd99abf536e7424e2b321f2e2ad.tar.gz |
Merge commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2'
* commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2':
libavcodec/mjpeg_qsv: Add QSV MJPEG encoder
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions