Untested merge of master.
authorCarl Hetherington <cth@carlh.net>
Sun, 21 Apr 2013 21:41:52 +0000 (22:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 21 Apr 2013 21:41:52 +0000 (22:41 +0100)
commit47f25009bcbc765e397bcb471dd361a511c99daf
tree356ac924524183047a84e34674985b3a00c5ca24
parentafc495f722f89fea0bcc579046d1a5d362e36f69
parente8d8a27c7f6861b031b3250b0ad50d04c41a7721
Untested merge of master.
34 files changed:
debian/changelog
debian/rules
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/decoder.h
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_decoder.cc
src/lib/ffmpeg_decoder.h
src/lib/film.cc
src/lib/format.cc
src/lib/format.h
src/lib/imagemagick_decoder.cc
src/lib/imagemagick_decoder.h
src/lib/matcher.cc
src/lib/player.cc
src/lib/player.h
src/lib/processor.h
src/lib/sndfile_decoder.cc
src/lib/sndfile_decoder.h
src/lib/transcoder.cc
src/lib/util.cc
src/lib/util.h
src/lib/video_decoder.cc
src/lib/video_decoder.h
src/lib/video_sink.h
src/lib/video_source.cc
src/lib/video_source.h
src/wx/film_viewer.cc
src/wx/film_viewer.h
test/test.cc
wscript