Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 4 Feb 2014 09:59:38 +0000 (09:59 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 4 Feb 2014 09:59:38 +0000 (09:59 +0000)
commit4ba8772aef261da209bbb882325fd61a8b479fd7
tree7fe9e3976d52503b474cfa96716c1bd4535b8f8d
parentb299c1873bf23414061d551843275c77a9256a05
parenteec6f90d8e2c2246ce674ae13e4f460b12a4f2a9
Merge master.
src/lib/encoder.cc
src/lib/exceptions.h
src/lib/ffmpeg_content.cc
src/lib/film.cc
src/lib/player.cc
src/lib/subrip_content.cc
src/lib/transcode_job.cc
src/wx/film_editor.cc
wscript