Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 14:00:35 +0000 (15:00 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 14:00:35 +0000 (15:00 +0100)
commita00ebbc68438e84076c65e99d0e70403afb4407d
tree6ee2f535eeb6b592c740e117d1f8f8657d6bcce8
parent665bc942f86bd7a8aeb2b38f3e9c2cb6662e6edc
parent606b3f759238aa6c0d12de064b301bf36b428220
Merge master.
src/lib/ab_transcoder.cc
src/lib/delay_line.cc
src/lib/delay_line.h
src/lib/imagemagick_decoder.h
src/lib/job.cc
src/lib/matcher.cc
src/lib/matcher.h
src/lib/transcoder.cc
src/lib/video_decoder.h
test/test.cc