Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:43:51 +0000 (23:43 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:43:55 +0000 (23:43 +0100)
commit483e9d8a2bb46ffaff8c41af7a7be01ebd7458df
tree5f5d0d243776aa8567fa7d7ba4814d17066ed4cd
parent5d31074daf0e448a636fbb0436f04ed54c20eab1
parentec8a69fab657f9cce624e8b0f4069d12696890bf
Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'

* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
  screenpresso: Correctly handle keyframes

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