Basics of joining.
authorCarl Hetherington <cth@carlh.net>
Sat, 23 Nov 2013 20:24:51 +0000 (20:24 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 23 Nov 2013 20:24:51 +0000 (20:24 +0000)
commitc3da7c64f01420447dbab7f5c2ea42ff1b911cc5
tree77832e3b515987132ce8fe64ee82eaa2e87b8bd0
parentbab2a1cf99c58dcb598fed383015b1937d3ea07f
Basics of joining.
18 files changed:
src/lib/audio_content.cc
src/lib/audio_content.h
src/lib/content.cc
src/lib/content.h
src/lib/exceptions.h
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_content.h
src/lib/ffmpeg_examiner.cc
src/lib/ffmpeg_examiner.h
src/lib/subtitle_content.cc
src/lib/subtitle_content.h
src/lib/util.cc
src/lib/util.h
src/lib/video_content.cc
src/lib/video_content.h
src/wx/content_menu.cc
src/wx/content_menu.h
test/util_test.cc