jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,394 Commits 1 Branch 0 Tags
Commit Graph

8394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jp9000
83913e1d31 deps/media-playback: Don't EOF while paused and seeking 
Fixes a bug where playback would completely stop when manually seeking
to the end of the file. Playback should not officially stop until
playback has unpaused.
 2020-07-21 16:40:33 -07:00
Jim
95401e5794
Merge pull request #3189 from exeldro/preload_paused 
deps/media-playback: Preload video when seeking paused
 2020-07-21 16:39:25 -07:00
Exeldro
7a33167769 deps/media-playback: Preload video when seeking paused 2020-07-20 14:23:13 -07:00
jp9000
3691dc536d win-dshow: Fix virtual camera filter name 
The filter name is supposed to be "OBS Virtual Camera"
 2020-07-20 14:22:49 -07:00
Jim
857c21b3f9
Merge pull request #3195 from cg2121/windows-vcam-fix 
win-dshow: Fix virtual camera enable bug
 2020-07-20 08:00:45 -07:00
Clayton Groeneveld
f4223ad061 win-dshow: Fix virtual camera enable bug 2020-07-20 06:02:16 -05:00
jp9000
ae29ec5239 rtmp-services: Fix memory leak 2020-07-19 22:06:34 -07:00
Jim
aa0a6526a8
Merge pull request #3177 from cg2121/linux-filedialog 
UI: Use non-native file dialog w/ Linux
 2020-07-19 21:40:52 -07:00
Jim
a7ad0087ec
Merge pull request #3188 from jpark37/more-ffmpeg-cleanup 
More FFmpeg cleanup
 2020-07-19 21:33:07 -07:00
Jim
4759340d95
Merge pull request #3187 from jpark37/virtual-override-warning 
UI: Fix warning about missing override
 2020-07-19 21:31:20 -07:00
jpark37
ffbc3ed923 obs-ffmpeg: Fix race and deprecation warnings 
Attempt to simply shutdown sequence to avoid race between vidoe and
write threads. Can no longer join on write thread from write thread.

Also use codecpar instead of deprecated codec member.
 2020-07-19 12:49:53 -07:00
jpark37
06e4b10675 libobs/media-io: Add missing codec_tag set 2020-07-18 23:35:35 -07:00
jpark37
f8cae4639e deps/media-playback: Remove unused #define 2020-07-18 23:33:21 -07:00
jpark37
2e7fee8e53 deps/libff: Remove very old version check 2020-07-18 23:32:15 -07:00
jpark37
6c86ff7936 UI: Fix warning about missing override 2020-07-18 23:31:15 -07:00
Jim
6a79657a19
Merge pull request #3185 from jpark37/codec-warnings 
FFmpeg deprecation warnings
 2020-07-18 19:34:23 -07:00
jpark37
be4a859383 obs-ffmpeg: Fix FFmpeg deprecation warnings 2020-07-18 18:47:58 -07:00
jpark37
40b4db0c0c libobs/media-io: Fix FFmpeg deprecation warnings 2020-07-18 18:47:52 -07:00
jpark37
0628c844f8 libobs: Fix FFmpeg deprecation warnings 2020-07-18 18:47:45 -07:00
Jim
8103457cda
Merge pull request #3183 from derrod/disable-updater 
UI: Add flag/file to disable built-in updater
 2020-07-18 17:48:51 -07:00
derrod
30862d75ae UI: Add flag/file to disable built-in updater 
When distributing OBS via third party platforms that have their own
update systems we want to be able to disable the OBS updater without
having to resort to having a separate build entirely.
 2020-07-18 21:33:47 +02:00
Jim
1fed223195
Merge pull request #3144 from WizardCM/clickable-script-description 
frontend-tools: Make links in script description clickable
 2020-07-18 11:48:33 -07:00
Matt Gajownik
2ca17e62ce frontend-tools: Make links in script description clickable 2020-07-18 11:14:26 -07:00
Jim
cd865a0be8
Merge pull request #3150 from jpark37/vulkan-dynamic-arrays 
win-capture: Remove fixed-size Vulkan arrays
 2020-07-18 10:46:22 -07:00
Jim
f7ec6043e2
Merge pull request #3179 from pkviet/coreaudio4 
coreaudio-encoder: Fix encoding of 4.0 speaker layout
 2020-07-18 10:45:36 -07:00
Jim
5537a6ce08
Merge pull request #3180 from venepe/raspberry-pi 
libobs: Add arm support
 2020-07-18 10:28:35 -07:00
Jim
22ea6c5017
Merge pull request #3181 from Dead133/drop-restreamio-ftl-support 
rtmp-services: drop Restream.io FTL support
 2020-07-18 10:20:23 -07:00
Clayton Groeneveld
762983b5d8 UI: Use non-native file dialog w/ Linux 2020-07-18 09:49:24 -07:00
Jim
934cff582a
Merge pull request #3175 from cg2121/fix-warnings 
UI, obs-ffmpeg, obs-filters: Fix compile warnings
 2020-07-18 08:32:49 -07:00
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
Dead133
1a29674840 rtmp-services: drop Restream.io FTL support 2020-07-18 14:16:41 +03:00
venepe
f5d877b393 libobs: Add arm support 2020-07-18 00:53:03 -05:00
Clayton Groeneveld
990a07dc18 UI, obs-ffmpeg, obs-filters: Fix compile warnings 2020-07-16 23:15:13 -05:00
pkv
2ab549e1c1 coreaudio-encoder: Fix encoding of 4.0 speaker layout 
For four channels, coreaudio encoder defaults to quad
(FL FR, BL BR).
So 4.0 needs to be explicitly set for the encoder.
 2020-07-17 04:41:06 +02: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