starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-01 10:17:47 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,323 Commits 20 Branches 251 Tags
21.0.2
Commit Graph
5323 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin EdwardsandGitHub 07599292bd Merge pull request #1186 from jp9000/macextras 
UI: Add deps to fix vst UI
21.0.2 		2018-02-06 21:08:09 -06:00
Colin Edwards 7b6da2c430 obs-vst: Add layout to QMacCocoaViewContainer (update submodule) 2018-02-06 20:54:46 -06:00
Colin Edwards f53bd0ef11 UI: Link Qt5::MacExtras 2018-02-06 19:50:16 -06:00
Colin Edwards 4109be4511 obs-vst: Link Qt5::MacExtras (update submodule) 2018-02-06 18:52:38 -06:00
Colin EdwardsandGitHub 4bd4b6bab5 Merge pull request #1184 from jp9000/pluginstyles 
CI: Include style plugins when packaging on OSX
 2018-02-06 10:02:00 -06:00
pkvietandjp9000 645d6ae8dd libobs/media-io: Change speaker layout to match FFmpeg aac. 
(This commit also modifies the obs-ffmpeg module)

The default channel layouts from aac spec are implemented in FFmpeg
native aac encoder as follows:

    AV_CH_LAYOUT_MONO,
    AV_CH_LAYOUT_STEREO,
    AV_CH_LAYOUT_SURROUND,
    AV_CH_LAYOUT_4POINT0,
    AV_CH_LAYOUT_5POINT0_BACK,
    AV_CH_LAYOUT_5POINT1_BACK,
    AV_CH_LAYOUT_7POINT1,

The correspondence of speaker layouts to AV_CH_LAYOUT from FFmpeg is
changed to reflect the previous table.

Although FFmpeg native aac encoder can now encode all the layouts listed
in avutil channel_layout.h (on master), there might be issues with older
FFmpeg binaries.

Note that 2.1 speaker layout will be encoded as AV_CH_LAYOUT_SURROUND
(FL FR FC) because it is not listed as the default layout for three
channels.

This just means some optimizations for LFE channel will not be used by
the encoder which will treat it as an SCE (single channel element).

Closes jp9000/obs-studio#1182
 2018-02-06 06:14:24 -08:00
JimandGitHub 94ee26afa7 Merge pull request #1179 from blueben/master 
cmake: Fix LuaJIT search
 2018-02-06 05:07:39 -08:00
JimandGitHub b2d9c4f4e5 Merge pull request #1180 from OsirisNL/fix_sources_context_menu 
UI: Fix grayed out Copy option in sources context menu
 2018-02-06 05:01:34 -08:00
Colin Edwards 9c7deb4df8 CI: Include style plugins when packaging on OSX 2018-02-05 19:04:56 -06:00
jp9000 5823a58277 CI: Comment out OSX _obspython copy (not ready yet) 2018-02-01 20:30:06 -08:00
jp9000 c7c5bb999a deps/obs-scripting: Fix cur. script being NULL for script_tick 
Fixes a bug where the thread local variable "current_lua_script" is not
set when calling script_tick.
 2018-02-01 20:01:46 -08:00
jp9000 a2ae16e98c deps/obs-scripting: Allow NULL script with script_log 
(This commit also modifies the frontend-tools module)

Prevents a potential crash when script_log is called by a thread spawned
by a python library.
 2018-01-31 16:20:45 -08:00
Michel 70fdd17287 UI: Fix grayed out Copy option in sources context menu 
This fixes a problem introduced in #1050 where the Copy option would
be grayed out when rightclicking a source above the currently selected
source. This also retains the functionality of not having the Copy option
enabled when no source is selected.
 2018-01-31 21:01:46 +01:00
Colin EdwardsandGitHub c87597f7d6 Merge pull request #1176 from jp9000/CI 
CI: Fixes to get OSX packaging working on travis
 2018-01-30 23:49:51 -06:00
Colin Edwards 3040ff6347 CI: Don't install python for OSX 2018-01-30 23:25:35 -06:00
Ben Krueger f374810403 cmake: Fix LuaJIT search 2018-01-30 21:13:10 -08:00
Colin Edwards 285d9bd6f1 CI: Add rpath info to _obspython 2018-01-30 18:15:44 -06:00
Colin Edwards 4e6bbb984f CI: Move obspython.so so it can be found in a .app 2018-01-29 18:59:36 -06:00
Colin Edwards 3ea5e99d0f CI: Update python rpath on osx 2018-01-29 18:12:32 -06:00
Colin Edwards d2c85a44f3 CI: Make sure that lua can find obslua 2018-01-29 17:43:19 -06:00
JimandGitHub ac6b01897f Merge pull request #1175 from DDRBoxman/osxscriptfix 
CI: Fetch RVM gpg key on osx
 2018-01-28 17:55:49 -08:00
Colin Edwards 1b9e49dfe3 CI: Fetch RVM gpg key on osx 2018-01-28 19:52:35 -06:00
JimandGitHub 4a71f3ad5c Merge pull request #1174 from DDRBoxman/osxscriptfix 
CI: Fix a ruby issue on travis OSX
 2018-01-28 17:48:33 -08:00
Colin Edwards 060edff177 CI: Fix a ruby issue on travis OSX 2018-01-28 19:47:01 -06:00
JimandGitHub 94b3c7c12a Merge pull request #1173 from DDRBoxman/osxscriptfix 
CI: Update OSX deps build scripts
 2018-01-28 17:32:10 -08:00
Colin Edwards e2005044dd CI: Update OSX deps build scripts 2018-01-28 19:04:46 -06:00
JimandGitHub 6ed5599504 Merge pull request #1170 from DDRBoxman/osxscriptfix 
CI: Point to newer brew python
 2018-01-25 10:32:53 -08:00
jp9000 8733228126 libobs: Update version to 21.0.2 (mac tag) 2018-01-25 10:29:54 -08:00
Colin Edwards 65e8bb04e8 CI: Point to newer brew python 2018-01-24 10:28:37 -06:00
jp9000 dce311cf1a deps/obs-scripting: Make ENABLE_SCRIPTING a user variable 
Makes it so that the scripting cmake variable ENABLE_SCRIPTING is a user
variable rather than a global internal cmake variable, and defers the
internal global cmake variable to SCRIPTING_ENABLED instead.
 2018-01-23 20:57:48 -08:00
jp9000 4eb5be4903 obs-filters: Fix hard cross-lock when using ducking 21.0.1 2018-01-22 16:44:22 -08:00
jp9000 bd30a0874d win-dshow: Fix decoding issues from encoded devices 2018-01-22 14:41:00 -08:00
Warchamp7andjp9000 0029bce7ae UI: Acri theme adjustments 
Fixing a reference to Rachni theme folder, some minor tweaks and
reverting volume meter foreground colors to original brightness.

Closes jp9000/obs-studio#1169
 2018-01-22 14:21:15 -08:00
jp9000 682c89bb33 libobs: Update version to 21.0.1 2018-01-22 13:55:54 -08:00
jp9000 84557629d8 docs/sphinx: Clarify Python windows installation 21.0.0 2018-01-22 09:32:29 -08:00
JimandGitHub e0c8decb2b Merge pull request #1168 from DDRBoxman/osxscriptfix 
CI: Install swig and luajit for osx travis
 2018-01-22 08:48:29 -08:00
Colin Edwards d810e3dbfb CI: Install swig and luajit for osx travis 2018-01-22 10:34:43 -06:00
jp9000 c5b58211da deps/obs-scripting: Prevent potential python startup issues 
Prevents Python from automatically trying to load from PATH on startup
on windows.  The user should set their Python 3 path themselves.
 2018-01-22 07:33:17 -08:00
jp9000 cee790a5c6 enc-amf: Prevent detect-amf from showing fail dialogs 
Prevents the user when detect-amf piped program crashes due to driver
crash.
 2018-01-22 07:29:55 -08:00
jp9000 ee563f874f UI: Reduce size of "refresh" icons 2018-01-22 07:29:50 -08:00
JimandGitHub 2f10a4cbd2 Merge pull request #1167 from Palakis/multiview-font-fix 
UI: fix Multiview labels readability
 2018-01-22 05:46:15 -08:00
jp9000 cb47c61e42 Revert "obs-outputs: Fix FMS auth with query string" 
This reverts commit 5cf11d6726.
 2018-01-22 05:40:26 -08:00
Palakis 632596bb6b UI: fix Multiview labels readability 2018-01-22 14:00:41 +01:00
Gol-D-Ace ae22886f67 Update translations from Crowdin 2018-01-22 04:55:52 +01:00
JimandGitHub 60e9e56253 Merge pull request #1160 from DDRBoxman/cefosx 
CI: Update CEF version on travis for osx
 2018-01-21 05:54:25 -08:00
JimandGitHub 4fed7115fa Merge pull request #1161 from juvester/trusty-cmake-fix 
cmake: Search for Python 3.4
 2018-01-21 05:52:04 -08:00
juvester 7b6af4cc93 CI: Enable scripting in Linux builds 2018-01-21 14:41:06 +02:00
juvester 206c853d00 cmake: Search for Python 3.4 
Fixes an issue where Python libraries aren't found on Ubuntu 14.04
because CMake 2.8 only searches up to Python 3.3.
 2018-01-21 14:27:55 +02:00
Colin Edwards d5877f7a03 CI: Update CEF version on travis for osx 2018-01-21 00:12:44 -06:00
jp9000 7abbd4d247 libobs: Update version to 21.0.0 2018-01-20 16:46:33 -08:00