Minor fix, correct AppWarning text.

Merge pull request #318 from shaderdyn/master

Minor fix, corrected AppWarning text.

Remove unused enum

Add ComPtr to OBSApi

Split shader creation into separate compilation and object creation functions

Rewrite async shader interface to use the new blob functions

Each invocation of the async interface now ultimately produces a unique shader
object, so multiple users of the same shader file don't share the same shader
parameters and samplers

Fix JSON parsing for XConfig

This parser really wasn't originally meant for JSON, it was originally
meant to be a form of HJSON, but this change should allow it to parse
both JSON and OBS' HJSON format.  It simply detects whether it starts
with an empty element (like JSON always does) and then it treats it as
JSON if present.  OBS' format doesn't use the empty element.

Added Paris to the Twitch/Justin.tv ingests

Merge pull request #321 from CommanderRoot/patch-1

Added Paris to the Twitch/Justin.tv ingests

Update AUTHORS file (translators)

Update localization strings from crowdin

RTMPPublisher able to use a web API to query for a ingestion URL and stream key/path. If a atream URL starts with http(s) then OBS will query this URL for a stream URL and path.

Added ParseString to XConfig.cpp

Reverted changes to XString. Not needed with XConfig changes in main branch.

Merge branch 'master' of https://github.com/jp9000/OBS into broadcast-via-web-api

Conflicts:
	OBSApi/Utility/XConfig.cpp

Added ParseString to XConfig.cpp

Reverted changes to XString. Not needed with XConfig changes in main branch.

Merge branch 'broadcast-via-web-api' of https://github.com/spangleb/OBS into broadcast-via-web-api

Fix to XConfig end of string being eaten and causing a parse fail.

Merge pull request #1 from spangleb/broadcast-via-web-api

Broadcast via web api

Merge branch 'master' of https://github.com/spangleb/OBS into broadcast-via-web-api

Reverted whitespace changes. Removed play path from log output.

Able to query web API via HTTPS as well as HTTP.

Reverted whitespace changes.

Removed play path from log output.

Merge branch 'master' of https://github.com/spangleb/OBS

Merge branch 'master' of https://github.com/spangleb/OBS

Conflicts:
	OBSApi/Utility/XConfig.cpp

Fixed conflict.

GraphicsCaptureHook.h change #define OLDHOOKS : 0 for new hooking methods, 1 for original hooking methods

Whitespace fix

Merge pull request #322 from vulture/newhooks

Newhooks

Fix libMinHook project (x64) output and intermediate paths

Initialize variable for all goto paths in RTMPPublisher

Fixes "Run-Time Check Failure"s for debug mode binaries in case the service
selection in RTMPPublisher::CreateConnectionThread fails

Merge branch 'master' of https://github.com/jp9000/OBS
Merge branch 'master' of https://github.com/spangleb/OBS