starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-25 07:50:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,360 Commits 20 Branches 254 Tags
33a928d6dbed0a2dea7f3a354591e07f05c2a4ea
Commit Graph
8360 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim 33a928d6db Merge pull request #3172 from PatTheMav/macos-disable-python 
CI: Disable building OBS with Python scripting support on macOS
 2020-07-18 08:31:49 -07:00
jp9000 56e56cd265 deps/media-playback: Reset TS when seeking 
If seeking occurs too close to the previous time value, it could cause
the playback to delay an abnormal amount of time, or if the time value
is under the previous value, then it would cause an assert.  So instead,
reset the next timestamp value to be instant in both cases if a seek
occurs to ensure timely playback.
 2020-07-16 19:00:01 -07:00
PatTheMav 68d4df9180 CI: Disable building OBS with Python scripting support on macOS 2020-07-16 19:23:20 +02:00
Jim 2ba2df6e59 Merge pull request #3167 from WizardCM/duplicator-log 
win-capture: Log duplicator display when updating properties
 2020-07-15 06:59:51 -07:00
Jim e5151ec4a9 Merge pull request #3168 from PatTheMav/ci-azure-mbedtls-fix 
CI: Add fix for macOS builds failing on push for Azure CI
 2020-07-15 06:58:54 -07:00
PatTheMav 28d8ca3323 CI: Add fix for macOS builds failing on push for Azure CI 2020-07-15 15:25:36 +02:00
Jim 6f2f62deb5 Merge pull request #3164 from matticusfinch/patch-3 
rtmp-services: Update Uscreen service
 2020-07-14 11:47:47 -07:00
Matthew 62c776db05 rtmp-services: Update Uscreen service 
rtmp-services: Update Uscreen service

rtmp-services: Update Uscreen service
 2020-07-14 11:38:14 -06:00
Matt Gajownik 0e07e034a0 win-capture: Log duplicator display when updating properties 2020-07-14 22:40:15 +10:00
Jim 56e67e545e Merge pull request #3160 from julijane/v4l2-fix-case 
linux-v4l2: Fix case of variables
 2020-07-13 13:47:55 -07:00
Juliane Holzt 19890b25ee linux-v4l2: Fix case of variables to snake_case 
This commit fixes the case of two recently added attributes of the
v4l2_data struct (in PR #2978). The new attributes were named
"frameRateUnchanged" and "resolutionUnchanged", i.e. using CamelCase
while all other attributes use snake_case. This change changes the
name of the two attributes to snake_case.
 2020-07-13 21:20:49 +02:00
Jim f094369c1d Merge pull request #3158 from exeldro/obs-ffmpeg_fix 
obs-ffmpeg: Fix play pause crash
 2020-07-12 16:02:00 -07:00
Jim fb587d0205 Merge pull request #3142 from NodeBoy2/bugfix/flvmetadata 
obs-outputs: Use FLV codec IDs for videocodecid/audiocodecid
 2020-07-12 15:45:10 -07:00
fengyifan 4ffe5859a1 obs-outputs: Use FLV codec IDs for videocodecid/audiocodecid 
Fixes the codec IDs in onMetaData to be compliant with FLV spec.  Using
string representation of these values is non-standard
 2020-07-12 14:00:56 -07:00
Exeldro 663605f650 obs-ffmpeg: Fix play pause crash 2020-07-12 20:11:47 +02:00
Jim 0443a1d302 Merge pull request #3152 from Aries1989/master 
libobs: Fix reading memory past size of string
 2020-07-11 20:47:34 -07:00
jp9000 18b915a47b libobs/util: Use is_padding() for wcsdepad as well 
Fix wcsdepad so that it checks for padding in the same way strdepad
does.
 2020-07-11 16:15:38 -07:00
sunjingzhao 05826491af libobs/util: Fix potential crash 2020-07-11 16:01:32 -07:00
Jim c539beb305 Merge pull request #3151 from WizardCM/translate-more-hotkeys 
libobs: Translate F13-F24 hotkeys on Windows
 2020-07-11 16:00:15 -07:00
jp9000 ebb093b8a3 Revert "UI: Match Windows taskbar state to tray icon" 
This reverts commit d442fda3fc.
 2020-07-11 06:12:51 -07:00
jp9000 959dbb64ed Revert "Merge pull request #3110 from WizardCM/taskbar-color-setting" 
This reverts commit 04e01458e5, reversing
changes made to b83a9dd0d6.
 2020-07-11 06:05:35 -07:00
Matt Gajownik 76bdbdfbb0 libobs: Translate F13-F24 hotkeys on Windows 
Fixes #2377
 2020-07-11 16:27:44 +10:00
Jim aade26649b Merge pull request #3147 from PatTheMav/ci-label-detection 
CI: Add label change detection for Github Action re-runs
 2020-07-10 21:23:55 -07:00
Jim baf55054e6 Merge pull request #3122 from Don-Stive/master 
Add "Taryana - Apachat" streaming service.
 2020-07-10 20:44:00 -07:00
Jim 5728df6cef Merge pull request #3149 from jpark37/vulkan-32bit 
win-capture Fix 32-bit Vulkan capture
 2020-07-10 20:39:13 -07:00
Jim 2e9d6141ec Merge pull request #3140 from JohannMG/fix-rgb-colorpicker 
UI: Make color display, don't show alpha value in color label
 2020-07-10 20:35:22 -07:00
Jim 04e01458e5 Merge pull request #3110 from WizardCM/taskbar-color-setting 
UI: Add setting for taskbar color
 2020-07-10 20:34:22 -07:00
Jim b83a9dd0d6 Merge pull request #3133 from jpark37/fix-plane-heights 
libobs: Fix video scalar copy heights
 2020-07-10 20:31:50 -07:00
Jim 35760fa2d0 Merge pull request #3125 from adalessa/fix-scene-switcher 
UI: Fix scene switcher not detecting some windows
 2020-07-10 20:30:04 -07:00
Jim 23425ea42b Merge pull request #3123 from WizardCM/fix-connecting-button 
UI: Fix unreadable Connecting Stream button
 2020-07-10 20:23:57 -07:00
iRonBot 893d55a694 rtmp-services: Add "Taryana - Apachat" streaming service 2020-07-10 20:22:14 -07:00
Jim 97ecf23df0 Merge pull request #3121 from jpark37/chrome-window-priority 
win-capture: Don't use Chrome classes for priority
 2020-07-10 20:20:26 -07:00
Jim 6c37f6faea Merge pull request #3113 from jpark37/vulkan-swap-decouple 
win-capture: Decouple swap and frame indices
 2020-07-10 20:15:38 -07:00
Matt Gajownik 081fc548c5 UI: Add setting for taskbar color 2020-07-10 20:12:59 -07:00
Jim 61384c199c Merge pull request #3104 from cg2121/auto-config-messages 
UI: Add informative messages to auto-config dialog
 2020-07-10 20:00:59 -07:00
Jim a4d8dd5fa9 Merge pull request #3109 from PatTheMav/prebuilt-swig 
CI: Update build script to use pre-built SWIG and QT dependencies
 2020-07-10 19:21:29 -07:00
Jim e055a1ffd8 Merge pull request #3108 from pkviet/macdevice 
mac-capture: Add several virtual audio drivers to Desktop audio
 2020-07-10 19:20:49 -07:00
Clayton Groeneveld 311a05cfe6 UI: Add informative messages to auto-config dialog 2020-07-10 19:10:54 -07:00
Jim 82fb74b49b Merge pull request #3101 from unknowndomain/source-scene-delete-fix 
UI: Set remove prompt default action
 2020-07-10 18:17:38 -07:00
Tom Lynch 5c807aea60 UI: Set remove prompt default action 
Resolves an issue on macOS where the default action is not set for
prompts when the user is removing one or multiple sources or scenes.
 2020-07-10 17:50:15 -07:00
Jim 8b00f7d341 Merge pull request #3085 from eric/fix-audio-on-timestamp-jump 
libobs: Reset audio data on timestamp jump
 2020-07-10 17:35:44 -07:00
Jim 04348871cc Merge pull request #3078 from eric/librtmp-connect-errors 
obs-outputs: Handle NetStream.Publish.BadName from rtmp server
 2020-07-10 17:21:48 -07:00
Jim 9497589b16 Merge pull request #3074 from jpark37/game-capture-remove-scale 
win-capture: Remove game capture scaling
 2020-07-10 16:47:39 -07:00
Jim 6347a221a0 Merge pull request #3050 from jpark37/qt-warnings-515 
UI: Fix warnings for Qt 5.15
 2020-07-10 15:30:26 -07:00
jpark37 7772a56a97 win-capture: Fix 32-bit Vulkan capture 
Vulkan loader needs pure name, which needs manual fix-up on 32-bit.
 2020-07-09 22:10:34 -07:00
PatTheMav d94709d945 CI: Update build script to use pre-built SWIG and QT dependencies 2020-07-10 01:01:32 +02:00
PatTheMav 7e5f827f9c CI: Add label change detection for Github Action re-runs 2020-07-10 00:31:53 +02:00
Jim 87915489b4 Merge pull request #3035 from brittneysclark/qsv_ui_and_vdenc 
obs-qsv11: Simplify QSV settings in UI and Enable AVC VDEnc on ICL+
 2020-07-08 20:59:57 -07:00
brittneysclark 17f013d0d0 obs-qsv11: Simplify UI quality parameters 
Combine MBBRC and CQM parameters into a perceptual video
enhancement box
 2020-07-08 20:24:27 -07:00
brittneysclark 28af453320 obs-qsv11: Enable VDEnc on ICL+ 
Enable AVC VDEnc (fixed function encode) on ICL+
 2020-07-08 20:24:27 -07:00