diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-17 00:26:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-17 00:26:04 +0000 |
| commit | bfb33feb40c5b014e9eae3958b1ecb8161f1d090 (patch) | |
| tree | b191a383b22233c395aabe03f7d8f745a99821fc /src/mxf.h | |
| parent | ac265d3d008328b9bdaf00c39ebcd86f263605c7 (diff) | |
| parent | 6e72e1d36f23a4236c4677f22792a6a4590943a3 (diff) | |
Merge master.
Diffstat (limited to 'src/mxf.h')
| -rw-r--r-- | src/mxf.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -30,6 +30,10 @@ namespace ASDCP { class AESDecContext; } +/* Undefine some stuff that the OS X 10.5 SDK defines */ +#undef Key +#undef set_key + namespace dcp { |