jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #671 from reboot/fix_missing_profile_end 

libobs: Fix missing call to profile_end() when encoding fails
master
Jim 2016-10-28 01:28:59 -07:00 committed by GitHub
parent 523e1ace49 e775abaa71
commit 7a077b311a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libobs/obs-encoder.c
View File

@ -796,7 +796,7 @@ static inline void do_encode(struct obs_encoder *encoder,
full_stop(encoder);
blog(LOG_ERROR, "Error encoding with encoder '%s'",
encoder->context.name);
return;
goto error;
}
if (received) {
@ -822,6 +822,7 @@ static inline void do_encode(struct obs_encoder *encoder,
pthread_mutex_unlock(&encoder->callbacks_mutex);
}
error:
profile_end(do_encode_name);
}