Merge master branch.
authorCarl Hetherington <cth@carlh.net>
Wed, 23 Jan 2013 20:15:13 +0000 (20:15 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 23 Jan 2013 20:15:13 +0000 (20:15 +0000)
commit420adb1fd2910fd24eb84be98169afc209f76a0e
tree91efc15ae6351a1b93e3867b6685fb3922933efc
parent4233db111cc4b1ca8a1a82b8aac96805a866ffa0
parent742f0fb10fb38a73d517e2a8870cd03ebefefa20
Merge master branch.
14 files changed:
src/lib/dcp_video_frame.h
src/lib/ffmpeg_decoder.cc
src/lib/film.cc
src/lib/film.h
src/lib/filter_graph.cc
src/lib/format.cc
src/lib/image.cc
src/lib/imagemagick_decoder.cc
src/lib/server.cc
src/lib/subtitle.cc
src/lib/util.cc
src/wx/film_editor.cc
src/wx/film_editor.h
src/wx/film_viewer.cc