mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-17 10:48:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,076 Commits 17 Branches 236 Tags
dfe83a7f918dc67eb347bb7fbbc7745815dd2c81
Commit Graph

6076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Edwards
dfe83a7f91 Merge pull request #1604 from DDRBoxman/keyerrgb 
Decklink: only use RGBA when using keyer
 2019-01-04 23:05:53 -06:00
Colin Edwards
b09880bf2d Merge pull request #1594 from DDRBoxman/qsvwtf 
obs-qsv11: Log errors on init
 2019-01-04 22:55:50 -06:00
Colin Edwards
e296855d14 Decklink: only use RGBA when using keyer 2019-01-04 22:25:08 -06:00
Jim
37dc3cde2b Merge pull request #1598 from chaturbatecom/chaturbatesourcesupdate2 
rtmp-services: Update Chaturbate POPs
 2019-01-04 19:43:49 -08:00
Colin Edwards
e9b4d50606 obs-qsv11: Log errors on init 2019-01-04 20:01:39 -06:00
Jim
3d401b7068 Merge pull request #1582 from justinlynn/port-to-ppc64 
Build on PPC64LE using x86 Intrinsic Compat Shims
 2019-01-04 16:19:01 -08:00
Jim
06f0203b22 Merge pull request #1581 from rkfg/dev 
UI: Support fractional scaling
 2019-01-04 16:05:50 -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
1e6bfa2eb1 Merge pull request #1572 from craftwar/utf8-fix 
libobs: Fix utf-8 bom is not properly skipped
 2019-01-04 14:55:57 -08:00
Jim
dcd2f34236 Merge pull request #1556 from pkviet/limiter-separate 
obs-filters: Add limiter filter
 2019-01-04 14:33:48 -08:00
Michael Fabian 'Xaymar' Dirks
93549ea17c libobs: Add get_defaults2 and get_properties2 for encoders 
Adds optional alternate functions to allow passing the encoder type_data
to reduce code duplication.

Closes obsproject/obs-studio#1541
 2019-01-04 12:23:46 -08:00
Jim
62935bfef9 Merge pull request #1521 from Andersama/patch-31 
libobs: Fix crash when pixel or vertex shader are missing
 2019-01-04 06:37:53 -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
7246caae0f Merge pull request #1593 from WizardCM/patch-1 
Add Discord badge to README
 2018-12-28 01:43:52 -08:00
Matt Gajownik
bc9e20a242 Add Discord badge to README 2018-12-28 20:22:54 +11:00
Jim
1f44e06490 Merge pull request #1591 from exeldro/circlebuf 
libobs: Fix circlebuf_pop_back returning front
 2018-12-27 03:47:42 -08:00
Exeldro
a0a0ca73c1 libobs: Fix circlebuf_pop_back returning front 2018-12-27 09:28:49 +01:00
rkfg
4e9e692a69 UI: Support fractional scaling 
On Linux the preview widget scaling uses only the integer part of the
scale. This results in a partially non-repainting window that looks
buggy and annoying.
 2018-12-20 19:34:40 +03:00
Jim
c9612983e6 Merge pull request #1585 from pkviet/settings 
UI: Revert default tab in Settings > Output: Advanced tab to Stream tab
 2018-12-19 21:06:59 -08:00
pkviet
d5fbb97990 UI: Revert default tab in Settings > Output: Advanced to Stream tab 
Commit 2fedcab987 changed the default index for widget "advOutTabs"
in OBSBasicSettings.ui; revert to index 0 (stream tab).
 2018-12-20 03:27:21 +01:00
J Lynn
36a6629e6b Add support for building on PPC64LE using x86 Intrinsic Compat Shim 2018-12-17 05:33:16 +11: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
craftwar
0a6dc398b7 libobs: Fix utf-8 bom is not properly skipped 2018-12-10 07:57:32 +08:00
probonopd
f1b9f6b3ce UI: Show "OBS Studio" in linux desktop link 
Closes obsproject/obs-studio#1563
 2018-12-07 12:51:09 -08:00
pkviet
736b7f0d35 UI: Fix display of mono source with surround output 
A mono input with surround output is upmixed by swresampler by routing
it to FC (front center) by default which corresponds to third channel
for 3.0, 4.0, 4.1, 5.0, 5.1, 7.1. (The other channels are muted.)
But the volume meters are set to show the first channel for mono sources.
Therefore although audio is processed, it would not show on the meter.
This fixes this display issue.

Closes obsproject/obs-studio#1540
 2018-12-07 12:38:17 -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
jp9000
be2b46c431 CONTRIBUTING.rst: Add Discord server and dev chat 
Closes obsproject/obs-studio#1568
 2018-12-06 09:19:18 -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
Olivier Humbert
711230e627 UI: Add French to UI/dist/obs.desktop 
Closes obsproject/obs-studio#1551
 2018-12-06 05:43:17 -08:00
Dmitry-Me
45a143a504 win-mf: Initialize member variable 2018-12-06 10:14:54 +03:00
Jim
875e13baf9 Merge pull request #1545 from pkviet/syncfix 
libobs: Fix audio offset not reset for all tracks
 2018-12-05 18:04:29 -08: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
jp9000
2168458601 UI: Add /LARGEADDRESSAWARE for MSVC x86 executable 
Use /LARGEADDRESSAWARE linker option when compiling 32bit executables on
Windows.

Closes obsproject/obs-studio#1546
 2018-12-04 08:56:58 -08:00
Alex Anderson
fc97512f71 libobs: Fix crash when pixel or vertex shader are missing 
Checks that the token is not null while looping. Logs errors when pixel
or vertex shader are missing.
 2018-12-03 15:02:20 -08:00
Jim
884e61f078 Merge pull request #1538 from cg2121/fix-batch-remux-warning 
UI: Fix batch remux compiler warning
 2018-12-03 14:41:12 -08:00
pkviet
1002f9b695 libobs: Log audio source when buffering is added 
Closes obsproject/obs-studio#1521
 2018-12-03 09:23:38 -08:00
jp9000
4fa30c619c libobs: Fix starting timestamp for preloaded frames 
If audio monitoring is enabled and set to output only, the
obs_source_show_preloaded_video function would still incorrectly set the
current source audio output timestamp to the current system time, which
would cause audio to use an incorrect starting point from long ago for
the first starting audio segment if audio monitoring is then turned off
some time after having started the source.

Instead, the starting timestamp should be set to 0 if audio monitoring
is enabled with no output to stream, so that if/when audio monitoring is
disabled, it recalculates the starting timestamp of the first audio
packet on the spot again.

Closes obsproject/obs-studio#1522
 2018-12-03 08:44:55 -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
Jim
bfe934f0f8 Merge pull request #1532 from RytoEX/add-status-badges 
Add status badges to README
 2018-12-03 06:15:37 -08:00
Jim
64104e6e35 Merge pull request #1531 from SuslikV/patch-8 
UI: Remove scrollbar line controls for Dark theme
 2018-12-03 06:13:51 -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
Jim
4f706a1b78 Merge pull request #1523 from cg2121/fix-saved-projectors-bug 
UI: Fix bug when loading saved projectors
 2018-12-03 05:28:14 -08:00