Merge master; fix crash on new film.
authorCarl Hetherington <cth@carlh.net>
Fri, 26 Apr 2013 22:41:02 +0000 (23:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 26 Apr 2013 22:41:02 +0000 (23:41 +0100)
commitf861018389acd9d277fe34d7621182b9b54f977f
tree499bae7640ce99a13c31ea9c870d426084480aec
parentf09c6b53f155de601900afa90045059b20310c0d
parent86011ad6b4ea0004a51c59b0563cf89c0947546d
Merge master; fix crash on new film.
42 files changed:
builds/control-12.04-32
builds/control-12.04-64
builds/control-12.10-32
builds/control-12.10-64
cscript
debian/rules
src/lib/ab_transcoder.cc
src/lib/ab_transcoder.h
src/lib/analyse_audio_job.cc
src/lib/audio_sink.h
src/lib/audio_source.cc
src/lib/audio_source.h
src/lib/encoder.cc
src/lib/encoder.h
src/lib/image.h
src/lib/matcher.cc
src/lib/player.cc
src/lib/player.h
src/lib/po/es_ES.po
src/lib/po/fr_FR.po
src/lib/po/it_IT.po
src/lib/po/sv_SE.po
src/lib/transcoder.cc
src/lib/transcoder.h
src/lib/util.cc
src/lib/util.h
src/lib/video_sink.h
src/lib/video_source.cc
src/lib/video_source.h
src/tools/dcpomatic_cli.cc
src/tools/po/es_ES.po
src/tools/po/fr_FR.po
src/tools/po/it_IT.po
src/tools/po/sv_SE.po
src/tools/servomatictest.cc
src/wx/film_viewer.cc
src/wx/film_viewer.h
src/wx/po/es_ES.po
src/wx/po/fr_FR.po
src/wx/po/it_IT.po
src/wx/po/sv_SE.po
test/test.cc