Merge commit '83f230c2445a94fdd94c66504482217fcece5909'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:46:52 +0000 (22:46 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 21:46:52 +0000 (22:46 +0100)
commit939345854a9e8ab32e88b9c9c99c8772049fb965
treecfd14d6e1004644dcec785914835998063afa07a
parenta82d1a8c7a4b313a8d41334acbbb767c530c8e26
parent83f230c2445a94fdd94c66504482217fcece5909
Merge commit '83f230c2445a94fdd94c66504482217fcece5909'

* commit '83f230c2445a94fdd94c66504482217fcece5909':
  lavc: VAAPI MJPEG encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/vaapi_encode_mjpeg.c