starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-26 09:21:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,028 Commits 20 Branches 255 Tags
4aa10cac3ce9209828d054a2ff1a6c2dc2ac5115
Commit Graph
6028 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jp9000 8cb80e1394 libobs/util: Make default val INVALID_HANDLE_VALUE 
Certain windows functions may allow 0 as a valid handle value, therefore
INVALID_HANDLE_VALUE is a more appropriate initialization value.

Closes obsproject/obs-studio#1519
 2018-12-03 04:32:20 -08:00
Jim 1db398ad8c Merge pull request #1518 from fredemmott/stopping-on-delay-stop 
ui: Emit STREAMING_STOPPING when stop queued
 2018-12-03 04:27:18 -08:00
jp9000 03cca9d95a libobs: Background color of 0 should not be gray 
When calling obs_display_set_background_color, the value set in the
'color' parameter should always be used as-is.  0 should not indicate a
color other than black.  To do anything otherwise is silly and confusing
for users of the API.

Closes obsproject/obs-studio#1516
 2018-12-03 04:09:30 -08:00
Jim 7df96986dd Merge pull request #1515 from Dmitry-Me/initMemberVar2 
decklink: Initialize member variable
 2018-12-03 03:43:49 -08:00
Colin Edwards a347b63447 Merge pull request #1561 from juvester/ci-vlc-dl 
CI: Use proper VLC release tarball
 2018-11-30 21:19:48 -06:00
juvester 98fc5750db CI: Use proper VLC release tarball 
As noted by ePirat, the VLC releases on GitHub are not official
releases, just repo snapshots. Use the official VLC 3.0.4 release
tarball to ensure maximum stability.
 2018-11-30 22:33:04 +02:00
Colin Edwards 53f9544a95 Merge pull request #1560 from juvester/ci-osx-vlc-fix 
CI: Use VLC 3.0.4 instead of master for macOS
 2018-11-30 11:05:22 -06:00
juvester d10e4cd040 CI: Use VLC 3.0.4 instead of master for macOS 
Fixes an issue where macOS builds on Travis would fail due to changes
in VLC master branch.
 2018-11-30 18:03:48 +02:00
Jim 01e8426981 Merge pull request #1554 from ab22/buffer-fill-fix 
libobs: memset() the correct buff size
 2018-11-26 03:19:47 -08:00
Abelardo E. Mendoza e345b00120 libobs: memset() the correct buff size 2018-11-25 22:45:11 -06:00
jp9000 0951039322 libobs: Do not process panning if panning centered 
Fixes a bug where audio panning would always be processed even if
panning was centered (and thus inactive).
 2018-11-23 03:24:11 -08:00
Gol-D-Ace e6ac830247 CI: Update Qt path on Windows 
AppVeyor recently updated their Qt version to 5.11.2 which breaks
builds, because of the outdated path. Using this path should always
ensure that the newest subversion of Qt 5.11 gets used.
 2018-11-13 14:26:42 +01:00
Ryan Foster 6983075f7f Add AppVeyor CI status badge to README 2018-10-31 23:16:10 -04:00
Ryan Foster 5a428cc605 Add Travis CI status badge to README 2018-10-31 23:15:36 -04:00
SuslikV 7656ee95db UI: Remove scrollbar line controls for Dark theme 
Fixes an issue when it's hard to perform drag-by-mouse move of the
scrollbar while handle is at corner and has minimum size.

Info: the handle minimum size styled as 20px, while add/sub-line is
14px, thus only 6px left for mouse drag when handle resides at corner.
While handle styled to cover whole bar including, subcontrol elements,
it is better to remove the hidden subcontrols completely.
 2018-10-26 18:46:24 +02:00
Clayton Groeneveld 271322bf65 UI: Fix bug when loading saved projectors 
This fixes a bug on Linux where fullscreen projectors wouldn't
quite be fullscreen when loaded on start.
 2018-10-22 00:32:57 -05:00
Fred Emmott bab9d6e96d UI: Emit STREAMING_STOPPING event immediately 
If there's a delay, it will *also* be ommitted after the appropriate
number of seconds.

I was originally going to add a new event for this, however this is
consistent with STREAMING_STARTING, which is emitted at the start
of the delay, not the end.
 2018-10-17 18:52:20 -07:00
Dmitry-Me d9ca4d540a decklink: Initialize member variable 2018-10-09 18:00:20 +03:00
pkviet 047e586eaf UI: Add multi-track FFmpeg output support 2018-10-04 20:32:35 -07: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
jp9000 b8a3ae1b10 libobs: Add multi-track support to non-encoded outputs 2018-10-04 20:32:35 -07:00
Terje Gundersen 8b98568bbc UI: Don't transition if already transitioning (studio mode) 
Closes obsproject/obs-studio#1304
 2018-10-01 19:37:33 -07:00
Michael Fabian 'Xaymar' Dirks e55579e63d libobs: Add obs_enum_scenes for enumerating scenes 
Closes obsproject/obs-studio#1507
 2018-10-01 10:24:42 -07:00
jp9000 35dc89f5ca libobs-d3d11: Use mip levels are used in resource view 2018-09-28 16:37:48 -07:00
Alex Anderson 4eac034814 libobs-opengl: Add int2-4 support 
Closes obsproject/obs-studio#1506
 2018-09-28 13:59:49 -07:00
Jim a60b3987fc Merge pull request #1504 from Xaymar/patch-obs-amd-encoder 
enc-amf: Update to 2.5.0.1 and update repository address
 2018-09-28 11:31:42 -07:00
Jim d2d8cc6456 Merge pull request #1503 from cg2121/fix-resizeoutput-typo 
UI: Fix typo with resize output text
 2018-09-28 11:27:49 -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
Clayton Groeneveld e8687b0965 UI: Fix typo with resize output text 2018-09-27 18:46:41 -05:00
jp9000 7ab488b100 Revert "Merge pull request #1498 from Xaymar/patch-obs-amd-encoder" 
This reverts commit 5edeaa3046, reversing
changes made to 0d28081997.
 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 94e44e698e Merge pull request #1497 from cg2121/fix-autoremux-warning 
UI: Fix auto remux warning
 2018-09-25 15:05:54 -07:00
Clayton Groeneveld c74e70ce49 UI: Fix auto remux warning 
This fixes the QAbstractItemModel invalid index warning.
 2018-09-25 14:19:50 -05:00
Jim c786f3cafc Merge pull request #1496 from cg2121/resize-output-text 
UI: Change resize output text
 2018-09-25 08:43:51 -07: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
Steve Wills 2f51abf994 libobs: Add pkgconfig support 
Based on:

http://dailycommit.blogspot.com/2016/10/how-to-generate-pkg-config-file-with.html
https://people.freedesktop.org/~dbn/pkg-config-guide.html

Should allow third party plugins to find and use libobs more easily.

Closes obsproject/obs-studio#1467
 2018-09-24 14:25:41 -07:00