Fix #132

This involved quite a lot of re-jigging the encoder hierarchy to
accomodate "raw" (unencoded) output for video as well. It also made a
certain amount of sense to redo the test suite at the same time and
merge raw tests with cooked tests.