jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,072 Commits 1 Branch 0 Tags
Commit Graph

1825 Commits

Author SHA1 Message Date
Jim
37dc3cde2b
Merge pull request #1598 from chaturbatecom/chaturbatesourcesupdate2 
rtmp-services: Update Chaturbate POPs
 2019-01-04 19:43:49 -08:00
Colin Edwards
2e4bcf5dc0
Merge pull request #1576 from DDRBoxman/rebasedkeyer 
Decklink: Keyer Support
 2019-01-04 17:34:50 -06:00
Colin Edwards
19bc92d267 Decklink: Keyer support 2019-01-04 17:34:00 -06:00
Jim
dcd2f34236
Merge pull request #1556 from pkviet/limiter-separate 
obs-filters: Add limiter filter
 2019-01-04 14:33:48 -08:00
Jim
e7fcd71715
Merge pull request #1513 from SingularityAzure/linux-capture-xcompcap-singularity 
linux-capture: XCompCap now chooses glXFBConfigs based on window depth
 2019-01-04 06:36:02 -08:00
Chaturbate
349849e518 rtmp-services: Update Chaturbate POPs 2019-01-01 17:03:33 -08:00
Jim
6d8f2f4f93
Merge pull request #1570 from derrod/purge-services 
rtmp-services: Remove dead servers/services
 2018-12-12 18:36:49 -08:00
Jim
494a37ec74
Merge pull request #1547 from SuslikV/patch-9 
decklink: Add declaration file for integer types
 2018-12-06 12:02:04 -08:00
Jim
d10368419d
Merge pull request #1569 from Dmitry-Me/initMemberVar3 
win-mf: Initialize member variable
 2018-12-06 09:12:58 -08:00
derrod
3ea4b47b1c rtmp-services: Remove dead servers/services 2018-12-06 16:54:07 +01:00
Cheeseness
d3b5ee55fb linux-v4l2: Make V4L device names unique 
Addresses mantis issue 0000702.

Closes obsproject/obs-studio#1553
 2018-12-06 05:47:03 -08:00
Dmitry-Me
45a143a504 win-mf: Initialize member variable 2018-12-06 10:14:54 +03:00
Jim
cf73fa6da1
Merge pull request #1557 from pkviet/fdk 
obs-libfdk: Compatibility fix for new API
 2018-12-05 12:47:03 -08:00
Bongalive
54fc877c23 rtmp-services: Added Bongacams ingest point 
Closes obsproject/obs-studio#1567
 2018-12-05 12:28:39 -08:00
Dead133
4aa10cac3c rtmp-services: Add Restream FTL ingests 
Closes obsproject/obs-studio#1533
 2018-12-03 07:41:50 -08:00
Dead133
c3340c2049 obs-output: Update ftl-sdk version 2018-12-03 07:41:50 -08:00
jp9000
d7e80f87e7 rtmp-services: Allow seamless service renaming 
Allows the ability for services to specify alternate or old names that
they used to have in the json service list so they can safely be renamed
seamlessly and use the proper service settings.  This way, if a user is
using an older service in their configuration, it can still detect which
service it's supposed to be using and apply those service-specific
settings for that user.
 2018-12-03 07:41:50 -08:00
Jonathan
79ebd6916a rtmp-services: Add Lightcast.com 
Closes obsproject/obs-studio#1530
 2018-12-03 05:50:27 -08:00
Serge Martial Nguetta
aacdb7328c rtmp-services: Add Linkstream 
Closes obsproject/obs-studio#1529
 2018-12-03 05:36:40 -08:00
pkviet
5cf2b5fbf9 obs-libfdk: Compatibility fix for new API 
fdk-aac v2.0.0 (aacenc 4.0.0) changes the AACENC_InfoStruct:
the encoderDelay parameter is replaced by two, nDelay and
nDelayCore. This patch checks the lib version and adjust the parameter
accordingly.
 2018-11-30 12:12:29 +01:00
pkviet
6e8758aa28 obs-filters: Add limiter filter 
This adds a hard limiter (based on compressor).
 2018-11-28 14:20:06 +01:00
SuslikV
2c52fe46fb
decklink: Add declaration file for integer types 2018-11-20 20:36:09 +02:00
Philip Haynes
bb42c8dfb6 linux-capture: XCompCap now chooses glXFBConfigs based on window depth 
Rather than inheriting the exact visuals from the window,
find whether the color buffer has alpha, find a config with
the necessary attributes for capture, and match its depth to
the depth of the window instead of the color buffer. Also,
cleanup glxpixmap texture binding before destroying the texture.

Update: Style conformancy changes
 2018-10-12 00:33:32 -05:00
Dmitry-Me
d9ca4d540a decklink: Initialize member variable 2018-10-09 18:00:20 +03:00
pkviet
340fb9d669 obs-ffmpeg: Enable multiple audio tracks for FFmpeg output 
This allows multiple audio tracks for the FFmpeg output.

Closes obsproject/obs-studio#1351
 2018-10-04 20:32:35 -07:00
Michael Fabian 'Xaymar' Dirks
62b748e40e enc-amf: Update to 2.5.0.1 and update repository address 2018-09-28 10:54:19 +02:00
jp9000
7ab488b100 Revert "Merge pull request #1498 from Xaymar/patch-obs-amd-encoder" 
This reverts commit 5edeaa3046bbd6b722d1e5e88276611520d2f65f, reversing
changes made to 0d28081997d080065d1577828543326d59af0e9e.
 2018-09-26 12:09:15 -07:00
Jim
a43a4fac7e
Merge pull request #1043 from DDRBoxman/decklinkout 
Decklink: Add decklink output
 2018-09-25 18:15:14 -07:00
Colin Edwards
21b67cff64 Decklink: add output support 2018-09-25 19:13:25 -05:00
Jim
5edeaa3046
Merge pull request #1498 from Xaymar/patch-obs-amd-encoder 
enc-amf: Update to 2.5.0 and update repository address
 2018-09-25 08:41:49 -07:00
Artem Merkulov
0d28081997 rtmp-services: Update liveedu.tv servers 
Closes obsproject/obs-studio#1499
 2018-09-25 08:38:24 -07:00
Jim
2c0ea84dc6
Merge pull request #1501 from lino-network/feature 
rtmp-services: Add DLive
 2018-09-25 08:36:19 -07:00
fefine
480f5a81c5 rtmp-services: Add DLive 2018-09-25 16:31:45 +08:00
Thomas Crider
a64ae11bce obs-ffmpeg: Add linux VAAPI h.264 encoding support 
Closes obsproject/obs-studio#1482
Closes obsproject/obs-studio#1256
 2018-09-24 23:12:24 -07:00
Jim
2a08f1d144
Merge pull request #1495 from SingularityAzure/linux-capture-xcompcap-singularity 
linux-capture: Fix repeated color-swapping and improve robustness further
 2018-09-24 14:55:09 -07:00
Michael Fabian 'Xaymar' Dirks
4b1991c4fc enc-amf: Update to 2.5.0 and update repository address 2018-09-24 06:15:32 +02:00
Philip Haynes
c286f0c202 linux-capture: Fix repeated swapping of swapRedBlue and improve robustness further 
Previously toggled swapRedBlue every update regardless of settings being set, which resulted in
moving or resizing of windows causing undesired color-swapping behavior. Also now use more direct
method of comparing visualIDs without type-casting and base the glxpixmap attributes on texture
format being used rather than the bit-depth of the window.
 2018-09-23 17:54:18 -05:00
Jim
47285c2ba6
Merge pull request #1485 from SingularityAzure/linux-capture-xcompcap-singularity 
linux-capture: Improve XComposite capture robustness
 2018-09-22 14:20:43 -07:00
Tom Pichler
04035cec65 rtmp-services: Add Vimm.TV 2018-09-21 09:08:48 +02:00
Jim
5cb76c9e79
Merge pull request #1389 from Andersama/scale-filter-variable-resolutions 
obs-filters: Add base canvas resolution option
 2018-09-18 12:10:04 -07:00
jp9000
8b936a1575 cmake: Fix UI being dependent on browser plugin files 
The UI currently is dependent on browser source files being present,
when in actuality the files may not have been fetched (i.e. not fetching
submodules).  This fixes that by using a macro to detect whether it's
available or not.

Closes obsproject/obs-studio#1490
 2018-09-18 08:56:34 -07:00
Jim
0f6761468b
Merge pull request #1479 from tompeeters368/master 
win-capture: Add option to adjust hook rate for game capture
 2018-09-17 13:52:41 -07:00
Jim
8435e581ac
Merge pull request #1377 from Andersama/chroma-key-optimization 
obs-filters: Optimize chroma key's box filter
 2018-09-17 02:18:41 -07:00
cg2121
4c7e13bb8a image-source: Decrease slideshow source memory usage 2018-09-16 19:31:26 -05:00
Jim
af320a0838
Merge pull request #1480 from kkartaltepe/module-descriptions 
Plugins: Add descriptions to modules
 2018-09-16 15:34:28 -07:00
Jim
e29447417c
Merge pull request #1488 from ePirat/cfstring-utils 
Consolidate CFString conversions
 2018-09-16 14:42:48 -07:00
Marvin Scholz
b1e837a18a coreaudio-encoder: Use libobs CFString utils 2018-09-16 22:41:01 +02:00
Marvin Scholz
94b30ec05a decklink: Use libobs CFString utils 2018-09-16 22:41:01 +02:00
Marvin Scholz
26a96c618f mac-capture: Use libobs CFString utils 2018-09-16 22:41:01 +02:00
Marvin Scholz
b2ece640e5 mac-vth264: Use libobs CFString utils 2018-09-16 22:41:01 +02:00