Merge 1.0 and some subtitling fixes.
authorCarl Hetherington <cth@carlh.net>
Tue, 24 Dec 2013 01:12:40 +0000 (01:12 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 24 Dec 2013 01:12:40 +0000 (01:12 +0000)
commitdc87445987c00b85a44b6372e43894067fae44b3
treecddc35f1117f5bcb403b31d674791e6a453765ab
parente194f0003b60b2607da0822485c56cd8267e78dc
Merge 1.0 and some subtitling fixes.
src/lib/decoded.h
src/lib/ffmpeg_decoder.cc
src/lib/image.cc
src/lib/player.cc
src/lib/player.h
src/lib/subtitle_decoder.cc
src/lib/subtitle_decoder.h
src/lib/video_decoder.cc