Merge branch 'master' into 1.0
authorCarl Hetherington <cth@carlh.net>
Thu, 23 Jan 2014 00:25:36 +0000 (00:25 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 23 Jan 2014 00:25:36 +0000 (00:25 +0000)
commit0703842433013ac1d5f79c09d7a8361dc2e565c8
tree1f8985669bea1ee72024e86f927255a667f78e8a
parent1c724e363a644abaee7efb39d6091e7b30de0fb6
parent054cc86d5ba734c72780b07a772a55e3a7000a4f
Merge branch 'master' into 1.0
src/picture_mxf_writer.h
src/stereo_picture_mxf_writer.cc