OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-02 09:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac-videotoolbox: Fix handling of unsuccessful encoder creation

Browse source 
When an encoder was not created in create_encoder, the appropriate
OSStatus value is returned but the calling code expects a boolean
return value.

The negative OSStatus code sent on error is thus interpreted as a
truthy value and the error is not detected. Changing the call signature
to correctly return an OSStatus (and change the caller to detect
error situations) fixes this.
This commit is contained in:
PatTheMav 2023-11-30 15:40:12 +01:00 committed by Lain
parent 859321b767
commit 63a131ce22
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/mac-videotoolbox/encoder.c
View file

@ -537,7 +537,7 @@ static inline CFDictionaryRef create_pixbuf_spec(struct vt_encoder *enc)
return pixbuf_spec;
}
static bool create_encoder(struct vt_encoder *enc)
static OSStatus create_encoder(struct vt_encoder *enc)
{
OSStatus code;
@ -678,7 +678,7 @@ static bool create_encoder(struct vt_encoder *enc)
enc->session = s;
return true;
return noErr;
}
static void vt_destroy(void *data)
@ -877,8 +877,10 @@ static void *vt_create(obs_data_t *settings, obs_encoder_t *encoder)
goto fail;
}
if (!create_encoder(enc))
code = create_encoder(enc);
if (code != noErr) {
goto fail;
}
dump_encoder_info(enc);