Merge commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2'
authorJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 16:45:09 +0000 (13:45 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 16:45:09 +0000 (13:45 -0300)
commit1926f13a206bfbd99abf536e7424e2b321f2e2ad
treea13838e5728599f13f4152fe0bee18092e6a2b9c
parent51f977c2c4b39d80ed39107a21b1647abce1acca
parent2fd6e7d077f590e4d7195356f9baeb271f8b9ae2
Merge commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2'

* commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2':
  libavcodec/mjpeg_qsv: Add QSV MJPEG encoder

Merged-by: James Almer <jamrial@gmail.com>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsvenc.c