Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 11 Feb 2014 12:04:27 +0000 (12:04 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 11 Feb 2014 12:04:27 +0000 (12:04 +0000)
commit8aeb741ccbe2edb528e98a431bf55459a6836a9b
treea14569b531d9867683a1ac1c94c8e0eb406906a8
parent4ba8772aef261da209bbb882325fd61a8b479fd7
parent22f2cd94132f93a159c2ce9fe263771cb5a5dbdf
Merge master.
16 files changed:
src/lib/ffmpeg.cc
src/lib/ffmpeg_content.h
src/lib/image.cc
src/lib/job.cc
src/lib/player.cc
src/lib/transcode_job.cc
src/lib/util.cc
src/lib/util.h
src/lib/wscript
src/tools/server_test.cc
src/wx/audio_plot.cc
src/wx/film_viewer.cc
src/wx/timeline.cc
test/resampler_test.cc
test/wscript
wscript