morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12272 from akallabeth/rdpecam-sws-fix

Browse Source 
[channels,rdpecam] fix sws context checks
This commit is contained in:
akallabeth
2026-02-08 16:53:51 +01:00
committed by GitHub
parent 7a015716bc 55a9161ecb
commit 1291e28af6
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/rdpecam/client/camera_device_main.c
View File

@@ -168,7 +168,7 @@ static UINT ecam_dev_sample_captured_callback(CameraDevice* dev, int streamIndex
{
WINPR_ASSERT(dev);
if (streamIndex >= ECAM_DEVICE_MAX_STREAMS)
if ((streamIndex >= ECAM_DEVICE_MAX_STREAMS) || (streamIndex < 0))
return ERROR_INVALID_INDEX;
CameraDeviceStream* stream = &dev->streams[streamIndex];

3
channels/rdpecam/client/encoding.c
View File

@@ -328,9 +328,6 @@ static BOOL ecam_encoder_compress_h264(CameraDeviceStream* stream, const BYTE* s
CAM_MEDIA_FORMAT inputFormat = streamInputFormat(stream);
enum AVPixelFormat pixFormat = AV_PIX_FMT_NONE;
if (!ecam_sws_valid(stream))
return FALSE;
#if defined(WITH_INPUT_FORMAT_H264)
if (inputFormat == CAM_MEDIA_FORMAT_MJPG_H264)
{