summaryrefslogtreecommitdiff
path: root/src/AtmosSyncChannel_Mixer.cpp
diff options
context:
space:
mode:
authorjhurst <jhurst@cinecert.com>2014-09-22 16:17:05 +0000
committerjhurst <>2014-09-22 16:17:05 +0000
commit4e702586c01e263e547c0a2a64859326d37fc022 (patch)
tree2d0d13928bf8b995065586bcdcfecd26c23a119c /src/AtmosSyncChannel_Mixer.cpp
parentab3e3df49a9d4a44a3bf11211e31bdeac3ef7bcf (diff)
win32 compiler fixes
Diffstat (limited to 'src/AtmosSyncChannel_Mixer.cpp')
-rw-r--r--src/AtmosSyncChannel_Mixer.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/AtmosSyncChannel_Mixer.cpp b/src/AtmosSyncChannel_Mixer.cpp
index a58b3cd..b035341 100644
--- a/src/AtmosSyncChannel_Mixer.cpp
+++ b/src/AtmosSyncChannel_Mixer.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2013-2013, John Hurst
+Copyright (c) 2013-2014, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -64,11 +64,14 @@ ASDCP::AtmosSyncChannelMixer::clear()
Result_t
ASDCP::AtmosSyncChannelMixer::OpenRead(ui32_t argc, const char** argv, const Rational& PictureRate)
{
- ASDCP_TEST_NULL_STR(argv);
+ ASDCP_TEST_NULL(argv);
PathList_t TmpFileList;
for ( ui32_t i = 0; i < argc; ++i )
- TmpFileList.push_back(argv[i]);
+ {
+ ASDCP_TEST_NULL_STR(argv[i]);
+ TmpFileList.push_back(argv[i]);
+ }
return OpenRead(TmpFileList, PictureRate);
}