Merge branch 'master' into video-player
authorCarl Hetherington <cth@carlh.net>
Tue, 18 Dec 2012 19:32:48 +0000 (19:32 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 18 Dec 2012 19:32:48 +0000 (19:32 +0000)
1  2 
src/lib/ffmpeg_decoder.cc
src/lib/subtitle.cc

Simple merge
Simple merge