Improve bundle fixup
Also disable missing field initializer warning for C
Merge pull request #64 from BtbN/osxmake

Improve bundle fixup
Fix bug where packets weren't interleaving

Packets were not interleaving, thus new data was being sent out with
potentially non-monotonically increasing timestamps
Temporary fix to allow file output
Implement some basic logging for windows
Fix a few warnings with jansson
Remove /SAFESEH compiler flag from 32bit release

For the strangest reason, it would cause errors when linking to ffmpeg
on the 32bit windows release build
Make OSX test application more idiomatic and add rendering callback
Use libc++ inspired clock instead of the deprecated AbsoluteToNanoseconds

This also makes the clang static analyzer happy (it complained about
uninitialized fields in the AbsoluteTime struct)
Properly bridge CF object so ARC can deal with it
Add NULL checks and assertions to fix clang static analysis problems

Also remove an unused variable from obs-encoder.c (via clang static
analysis)
Update test programs and filters

The test program and test filter wasn't working properly because the ID
for it had actually changed.

The test programs also weren't updated for the new main render callbacks
which must be used when making a program.
Merge branch 'master' of https://github.com/jp9000/obs-studio

Conflicts:
	test/osx/test.mm
Fix code that breaks with VC (terrible compiler)

VC2013 still does not properly support placement of variables anywhere
in the scope.  It's a garbage compiler, always will be a garbage
compiler.
Only do the alpha swizzle on alpha textures

Avoids problems if swizzles are used elsewhere (like in the newer X11
plugins)
OpenGL: Fix swizzle code again for alpha textures

My prior code was incorrect;  I mixed up the two parameters, the
GL_TEXTURE_SWIZZLE_* parameter specifies the target channel, and the
value itself specifies the source channel.,  If that makes sense.
Add glad opengl loader
Move from glLoadGen to GLAD
Add GLAD project and add to VS solution