Merge commit '95db8c757cb003a71b040b567f38be74151deb5c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:43:26 +0000 (23:43 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:43:35 +0000 (23:43 +0100)
commit5d31074daf0e448a636fbb0436f04ed54c20eab1
tree46b8059721722e01e3b7a2b59ce8912dbbaf6a44
parente4c8e1906440cb45bb662f0894281238ca150ace
parent95db8c757cb003a71b040b567f38be74151deb5c
Merge commit '95db8c757cb003a71b040b567f38be74151deb5c'

* commit '95db8c757cb003a71b040b567f38be74151deb5c':
  screenpresso: Add extended pixel format support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/screenpresso.c