Merge speed-up branch.
authorCarl Hetherington <cth@carlh.net>
Sun, 16 Dec 2012 14:53:22 +0000 (14:53 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 16 Dec 2012 14:53:22 +0000 (14:53 +0000)
commitaa230169f8b59b7cb2da9a3bbb8ce5f7600285c0
tree5cde52f6c50b9a56597e0f6ebad1f8e4aa5e1c8d
parent7fd2aff3af82d3e573934d046be26b72a67a93e6
parent3ce37f08e98b9c3a238fb1c9a6184fb7fd4e5667
Merge speed-up branch.
src/lib/examine_content_job.cc
src/lib/ffmpeg_decoder.cc
src/lib/ffmpeg_decoder.h
src/lib/film.cc
src/lib/film.h
src/lib/imagemagick_decoder.h
src/lib/transcoder.cc
src/lib/transcoder.h
src/lib/video_decoder.h
src/wx/film_editor.cc
src/wx/film_viewer.cc