Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 20 May 2014 12:23:26 +0000 (13:23 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 20 May 2014 12:23:26 +0000 (13:23 +0100)
commit39bc73fe192f932ed6695eb87b19de446e8b4f55
tree4811b0642b7fcd73206b037da4ffb342e90ce6dc
parentbb0a36c3a6bea9cd1ebdde7b8a3a04765e317569
parent884093edac5f63d26c02d411c73dfb52376ccf8f
Merge master.
28 files changed:
ChangeLog
src/lib/colour_conversion.cc
src/lib/content_video.h
src/lib/dcp_video_frame.cc
src/lib/dcp_video_frame.h
src/lib/encoder.cc
src/lib/encoder.h
src/lib/ffmpeg_decoder.cc
src/lib/image.cc
src/lib/image.h
src/lib/image_decoder.cc
src/lib/image_decoder.h
src/lib/image_proxy.cc
src/lib/player.cc
src/lib/player.h
src/lib/player_video_frame.cc
src/lib/player_video_frame.h
src/lib/server.cc
src/lib/transcoder.cc
src/lib/types.h
src/lib/video_content.cc
src/lib/video_decoder.cc
src/lib/video_decoder.h
src/lib/wscript
src/tools/server_test.cc
src/wx/film_viewer.cc
src/wx/film_viewer.h
test/client_server_test.cc