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

obs-ffmpeg: Fix possible NVENC crash

Browse Source 
If the codec hasn't even been fully initialized, calling these functions
in the shutdown code could cause a crash.
This commit is contained in:
Richard Stanway 2016-09-28 15:21:07 -07:00 committed by jp9000
parent 6d16c51cd1
commit a8020b37be
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
View File

@ -54,6 +54,7 @@ struct nvenc_encoder {
int height;
bool first_packet;
bool initialized;
};
static const char *nvenc_getname(void *unused)
@ -113,6 +114,8 @@ static bool nvenc_init_codec(struct nvenc_encoder *enc)
return false;
}
enc->initialized = true;
*((AVPicture*)enc->vframe) = enc->dst_picture;
return true;
}
@ -233,15 +236,19 @@ static bool nvenc_update(void *data, obs_data_t *settings)
static void nvenc_destroy(void *data)
{
struct nvenc_encoder *enc = data;
AVPacket pkt = {0};
int r_pkt = 1;
while (r_pkt) {
if (avcodec_encode_video2(enc->context, &pkt, NULL, &r_pkt) < 0)
break;
if (enc->initialized) {
AVPacket pkt = {0};
int r_pkt = 1;
if (r_pkt)
av_free_packet(&pkt);
while (r_pkt) {
if (avcodec_encode_video2(enc->context, &pkt, NULL,
&r_pkt) < 0)
break;
if (r_pkt)
av_free_packet(&pkt);
}
}
avcodec_close(enc->context);