Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:03:55 +0000 (11:03 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:05:49 +0000 (11:05 +0200)
commitdd1b1e32238be7e0abfbc90f546f4c1931915143
tree4b8abd932b61ab59663a97c9a6568653d33d38e7
parentdb0af7250a276700a349766c5412eb48ec630f0a
parentc3ed259e4fef64a1af4f6537be545fba47491aa9
Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9'

* commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9':
  fate: Move Canopus decoder tests to a separate file

Merged-by: Clément Bœsch <clement@stupeflix.com>
tests/Makefile
tests/fate/canopus.mak
tests/fate/lossless-video.mak
tests/fate/video.mak