starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-28 02:06:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,992 Commits 20 Branches 255 Tags
24e4a256f7bd3296370458be31441229c5386bba
Commit Graph
7992 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PatTheMav 24e4a256f7 CI: Add main Github Actions workflow for branch pushes and PRs 2020-04-19 04:07:28 +02:00
Colin Edwards e15f4e4454 Merge pull request #2732 from cg2121/ui-margins 
UI: Adjust a few margins
 2020-04-18 18:15:09 -05:00
Colin Edwards c03bad85ef Merge pull request #2658 from hselasky/alsa_support_freebsd 
plugins: Build ALSA plugin for FreeBSD
 2020-04-18 17:39:25 -05:00
Clayton Groeneveld f7caa1119c UI: Adjust a few margins 
-Remove 9px margins around central widget. This saves 18px of vertical
space. This will be helpful when the source context menu is added,
which is 24px tall.

-Adjusts margins in transitions dock. The top of the transitions dock
wasn't lined up with the top of the controls dock, which made it look
bad.
 2020-04-18 17:24:59 -05:00
Colin Edwards 8a89dd7a46 Merge pull request #2723 from exeldro/doc_prop_group 
docs/sphinx: Add Property Grouping
 2020-04-18 17:15:57 -05:00
Colin Edwards 47cfe13be2 Merge pull request #2648 from kkartaltepe/fix-previewlabel-styling 
UI: Fix previewLabel styling
 2020-04-18 16:32:43 -05:00
Richard Stanway 9927cf035b Merge pull request #2746 from exeldro/remove_scenes 
UI: Remove all scenes in ClearSceneData
 2020-04-18 21:37:52 +02:00
Jim 05b66262c8 Merge pull request #1786 from brittneysclark/qsv_texture_based_encoding 
obs-qsv: Enable QSV texture-based encoding
 2020-04-18 12:30:26 -07:00
jp9000 01df98b3aa obs-vst: Fix formatting 2020-04-18 12:28:19 -07:00
jp9000 5d45249d9f obs-browser: Fix formatting 2020-04-18 12:28:05 -07:00
Richard Stanway 4fda6cf846 Merge pull request #2700 from Bennik2000/mantis_0001603 
obs-ffmpeg: Fix media source not closing file when inactive
 2020-04-18 21:24:25 +02:00
Exeldro 029b4d1a05 UI: Remove all scenes in ClearSceneData 2020-04-18 17:08:52 +02:00
Richard Stanway a81071f8cc Merge pull request #2739 from exeldro/removed_sources 
libobs: Don't save removed sources
 2020-04-18 16:58:48 +02:00
Exeldro 874820ec2f libobs: Don't save removed sources 2020-04-18 08:30:06 +02:00
wolf247 8a5ad6ac92 rtmp-services: Update ChathostessModels service (#2745) 2020-04-18 01:29:47 -05:00
Ben Torell 19c5da4645 Merge pull request #2710 from emaste/ci 
CI: Add qt5-xml package for FreeBSD build task
 2020-04-17 14:43:21 -04:00
Ben Torell 97067f853f Merge pull request #2667 from emaste/buildfix 
linux-v4l2: Fix build with Clang 10.0
 2020-04-17 14:42:49 -04:00
brittneysclark cc896b6c03 obs-qsv11: Enable QSV texture-based encoding 
Enables a pipeline for texture-based encoding with QSV. Utilizes OBS
NV12 output for encode to avoid offloading them from GPU, which will
increase performance. The option to select old QSV pipeline still
remains and will fallback if new pipeline fails.
 2020-04-17 09:05:52 -07:00
Colin Edwards 355cd6ccc0 Merge pull request #2735 from DDRBoxman/osxcase 
libobs: Fix plugin folder search path case on macOS
25.0.7 		2020-04-16 19:41:11 -05:00
Colin Edwards b7b202fac7 libobs: Fix plugin folder search path case on macOS 2020-04-16 19:28:00 -05:00
Colin Edwards 7247a80b3c CI: Add freetype dep on osx 2020-04-15 23:37:07 -05:00
Keylase 8726425a6c rtmp-services: Add WASDTV (#2697) 2020-04-15 17:29:36 -05:00
Exeldro b7a17d5b22 docs/sphinx: Add Property Grouping 2020-04-15 16:40:52 +02:00
Colin Edwards e3c63c003a libobs: Update version to 25.0.6 (mac release) 25.0.6 2020-04-13 20:41:04 -05:00
Colin Edwards e7636f89a6 obs-vst: Don't allow widget close on macOS 2020-04-13 19:28:55 -05:00
Ed Maste c8fda43883 CI: Add qt5-xml package for FreeBSD build task 2020-04-13 14:24:57 -04:00
Richard Stanway 80d3d67847 Merge pull request #2708 from ken3353/fix-jack-input-client 
linux-jack: Fix conversion from channels to speaker layout
 2020-04-13 17:39:22 +02:00
chaselliu 04e76d7d94 linux-jack: Fix conversion from channels to speaker layout 2020-04-13 22:42:31 +08:00
Bennik2000 26810c31b6 obs-ffmpeg: Fix media source not closing file when inactive 2020-04-13 09:13:16 +02:00
Richard Stanway a43c10b173 UI: Refuse drop operations from our own widgets 
The UI feedback when dropping scene / source items on other parts of the
program indicated that something would happen instead of showing the
"no drop" icon.
 2020-04-13 03:07:30 +02:00
Richard Stanway 6e48f41d1f Merge pull request #2673 from emaste/projector-screen 
UI: Fix projector on other than primary display
 2020-04-13 01:03:45 +02:00
Ed Maste 7325eace24 UI: Fix projector on other than primary display 
Calling showFullScreen after setGeometry puts the projector on the
expected monitor.  Previously (on FreeBSD, at least) it opened on the
primary display.
 2020-04-12 18:43:23 -04:00
Ed Maste ec7fbadcdb linux-v4l2: Fix build with Clang 10.0 
add_control_property() was previously static inline bool, but did not
return a value and failed to build on FreeBSD-CURRENT with Clang 10.0,
with:

error: non-void function 'add_control_property' should return a value
 2020-04-12 18:41:36 -04:00
Richard Stanway 9fffd99661 Merge pull request #2109 from notr1ch/encoder-error-feedback 
obs-ffmpeg: Encoder error feedback
 2020-04-12 17:59:24 +02:00
Richard Stanway 15781073dc obs-ffmpeg: Add error text for NVENC AVERROR_EXTERNAL 
Since new NVENC still falls back, try to make the error from ffmpeg
NVENC more actionable for users.
 2020-04-12 17:35:27 +02:00
Richard Stanway 5e3e9c1f13 obs-ffmpeg: Use new encoder error handling functions 2020-04-12 17:05:19 +02:00
Richard Stanway 5dc9f989d6 libobs: Add support functions for encoder error handling 
Similar to how outputs can pass errors, add the same functionality for
encoders so that if an output encoder has an error, it is made available
to the output and eventually the UI / user.
 2020-04-12 17:05:19 +02:00
Richard Stanway ba18da6959 Merge pull request #2669 from emaste/gnu-stack 
deps: lzma: also use .note.GNU-stack on FreeBSD
 2020-04-12 16:48:28 +02:00
Richard Stanway 6dce4662cf Merge pull request #2682 from koizuka/rtmp-services-niconico 
rtmp-services: Add niconico
 2020-04-12 01:59:39 +02:00
Colin Edwards c5125e0a17 Merge pull request #2691 from DDRBoxman/syphon_arc 
mac-syphon: Move the syphon plugin over to ARC
 2020-04-10 20:59:54 -05:00
Colin Edwards eb40dbd453 mac-syphon: Move the syphon plugin over to ARC 2020-04-10 20:10:27 -05:00
Colin Edwards 2552cf9169 Merge pull request #2689 from obsproject/CI 
CI: Rewrite new deps paths in obs-ouputs.so
 2020-04-09 22:54:56 -05:00
Colin Edwards 7366b45392 CI: Rewrite new deps paths in obs-ouputs.so 2020-04-09 22:29:41 -05:00
Colin Edwards 1627623f4d Merge pull request #2688 from DDRBoxman/githubformat 
CI: Move clang format check into a seperate github workflow
 2020-04-09 21:27:53 -05:00
Colin Edwards 8b6f6d1c85 CI: Move clang format check into a seperate github workflow 2020-04-09 21:26:41 -05:00
Richard Stanway 9023a57afc Merge pull request #2598 from sorayuki/bugfix/rtmp-custom-memleak 
rtmp-services: Fix memory leak when updating rtmp-custom-service.
 2020-04-10 00:45:43 +02:00
Richard Stanway 011c760a7a Merge pull request #2641 from kkartaltepe/obs-outputs-warnings 
obs-outputs: Fix warnings WITH_RTMPS=OFF
 2020-04-10 00:42:24 +02:00
Richard Stanway 2d261e79ff Merge pull request #2663 from khng300/obs-25-fbsd-fix-execpath 
libobs/util: Add FreeBSD and Dragonfly support in os_get_executable_path_ptr()
 2020-04-10 00:40:46 +02:00
Richard Stanway 25054d233c Merge pull request #2677 from emaste/warning-fix 
UI: Fix warning compiling with Clang 10
 2020-04-10 00:39:07 +02:00
Ed Maste 9f4aaf22f0 UI: Fix warning when compiling with Clang 10 
Building with Clang 10 on FreeBSD 13-CURRENT emitted a warning about
logical not (!) applying only to the left hand side of a comparison.
Update the expression to match the style of other flags conditionals.
Verified that object code is the same.
 2020-04-10 00:37:37 +02:00