Merge commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 13:39:15 +0000 (14:39 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 13:39:23 +0000 (14:39 +0100)
commit622f18a2bf467623e6f68c4f8276c2efefda206f
tree40239695f0e75daed0675e3b28779036a3cda71b
parent78af369189eb5fac9b0fe40d7bd0ef33b63042bc
parentb39ab8549a53e2fc7978ab9db50e5c2ba6a6602d
Merge commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d'

* commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d':
  fate: Add test for indeo2 with delta frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>