Fix merge.
authorCarl Hetherington <cth@carlh.net>
Tue, 18 Dec 2012 21:13:53 +0000 (21:13 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 18 Dec 2012 21:13:53 +0000 (21:13 +0000)
commit602fd58eff38fdfccc489b9f77b3ff0ca0009566
treef44645730c3b412fcc0c79f4bca73260567a362d
parent039a55081427b1ff0026cd6b9ca787526d37ef92
parent0330d9b2924767d9240c5a25e9ed4327eb0a73bd
Fix merge.
src/lib/ffmpeg_decoder.cc
src/lib/subtitle.cc
src/wx/film_viewer.cc