Repair very bad merge. Mysterious.
authorCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 15:24:03 +0000 (16:24 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 15 Apr 2013 15:24:03 +0000 (16:24 +0100)
commit3f2365fcf3a1ffc50901eb2e4af246aa4c83e272
tree289a2fdbea44d1f5d8326601972e259e65aa0d80
parenta00ebbc68438e84076c65e99d0e70403afb4407d
Repair very bad merge.  Mysterious.
18 files changed:
src/lib/ab_transcoder.cc
src/lib/audio_decoder.h
src/lib/audio_sink.h
src/lib/audio_source.cc
src/lib/audio_source.h
src/lib/combiner.cc
src/lib/combiner.h
src/lib/delay_line.cc
src/lib/delay_line.h
src/lib/matcher.cc
src/lib/matcher.h
src/lib/processor.h
src/lib/sndfile_decoder.cc
src/lib/transcoder.cc
src/lib/video_decoder.h
src/lib/video_sink.h
src/lib/video_source.cc
src/lib/video_source.h