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)
commit2587f29e54bac098296dbef6557b9bf9bcdc2406
treef934cfc55d101e1ea939be999fc31f661b08ca43
parent8a1b1aca4862b62862e6b523998e328ec2889d30
parenta54bdb873641bbc84298f4424dba17a075d0c0da
Merge branch 'master' into video-player
src/lib/ffmpeg_decoder.cc
src/lib/subtitle.cc