Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 4 Jun 2014 11:33:41 +0000 (12:33 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 4 Jun 2014 11:33:41 +0000 (12:33 +0100)
commit8102046b2f29e0c7b234c29bf204b056cb30e64f
tree84933e8db7822e863ae9ab4e6524ab3176606b11
parent3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0
parent82926443230084739cb673a83b2ab1f9d733a07b
Merge master.
15 files changed:
ChangeLog
src/lib/audio_content.cc
src/lib/audio_mapping.cc
src/lib/audio_mapping.h
src/lib/colour_conversion.cc
src/lib/dcp_video_frame.cc
src/lib/image.cc
src/lib/player.cc
src/lib/playlist.cc
src/lib/util.cc
src/lib/util.h
src/lib/writer.cc
src/lib/wscript
src/wx/audio_mapping_view.cc
src/wx/audio_mapping_view.h