Merge 1.0-seek and subtitle-content.
authorCarl Hetherington <cth@carlh.net>
Wed, 15 Jan 2014 21:23:33 +0000 (21:23 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 15 Jan 2014 21:23:33 +0000 (21:23 +0000)
commit8353a009aae1a604251c0160193c39741c2fa27c
tree558d2b1951f2b4f05f0ab93b46d10afd0ebee929
parentd0bca7d33b8101cd87f78d5a76b2512dea3988f8
parent4e5d5c7dcc6470b8dc918d03a00e30c07df60efe
Merge 1.0-seek and subtitle-content.
20 files changed:
src/lib/decoded.h
src/lib/ffmpeg_decoder.cc
src/lib/player.cc
src/lib/player.h
src/lib/subrip.cc
src/lib/subrip.h
src/lib/subrip_content.cc
src/lib/subrip_content.h
src/lib/subrip_decoder.cc
src/lib/subrip_decoder.h
src/lib/subrip_subtitle.h
src/lib/subtitle_decoder.cc
src/lib/subtitle_decoder.h
src/lib/util.cc
src/wx/film_editor.cc
test/ratio_test.cc
test/subrip_test.cc
test/test.cc
test/test.h
test/wscript