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)
* commit '95db8c757cb003a71b040b567f38be74151deb5c':
  screenpresso: Add extended pixel format support

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

Simple merge