Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework...
authorCarl Hetherington <cth@carlh.net>
Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)
commitf90e90cdec39c7959c26e8199ee2170cedb4f256
treef1a59bbc3c493faa9da6385246b34fd21b332014
parent7fb622a18582f18fcc6cfe140a262fd6cc8cad88
parent7ee21d16c01b90c22192cd10f118419881fe504e
Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework-take5
src/lib/encoder.cc
src/lib/job.cc
src/lib/player.h