Merge master.
authorCarl Hetherington <cth@carlh.net>
Fri, 1 Mar 2013 20:13:03 +0000 (20:13 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 1 Mar 2013 20:13:03 +0000 (20:13 +0000)
commitdd7cf1ef6e860243b80f4c47a99393244f63a3d5
treea158d4f59dbb9f1806c1aa00104c123edcfbccce
parentf4c18d89c2fd68a0dbf03b4c72e25cc8214a3a5b
parent7b3f53a88e86154587269826064aa4c0a067f253
Merge master.
14 files changed:
src/lib/analyse_audio_job.cc
src/lib/encoder.cc
src/lib/ffmpeg_decoder.cc
src/lib/film.cc
src/lib/job.cc
src/lib/util.cc
src/lib/writer.cc
src/lib/wscript
src/tools/dvdomatic.cc
src/wx/audio_dialog.cc
src/wx/audio_plot.cc
src/wx/film_editor.cc
src/wx/film_viewer.cc
src/wx/wscript