ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try additional unrefs of hw_device_ctx and unref'ing after freeing codec

This commit is contained in:
Isaac Connor 2021-05-19 10:04:54 -04:00
parent 574adf0d1d
commit bfd3131e63
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zm_videostore.cpp
View File

@ -272,7 +272,7 @@ bool VideoStore::open() {
frames_ctx->initial_pool_size = 20;
if ((ret = av_hwframe_ctx_init(hw_frames_ref)) < 0) {
Error("Failed to initialize hwaccel frame context."
"Error code: %s",av_err2str(ret));
"Error code: %s", av_err2str(ret));
av_buffer_unref(&hw_frames_ref);
} else {
video_out_ctx->hw_frames_ctx = av_buffer_ref(hw_frames_ref);
@ -281,6 +281,7 @@ bool VideoStore::open() {
}
}
av_buffer_unref(&hw_frames_ref);
av_buffer_unref(&hw_device_ctx);
} // end if hwdevice_type != NONE
#endif
@ -666,9 +667,12 @@ VideoStore::~VideoStore() {
video_in_ctx = nullptr;
avcodec_close(video_out_ctx);
if (hw_device_ctx) av_buffer_unref(&hw_device_ctx);
Debug(4, "Freeing video_out_ctx");
Debug(3, "Freeing video_out_ctx");
avcodec_free_context(&video_out_ctx);
if (hw_device_ctx) {
Debug(3, "Freeing hw_device_ctx");
av_buffer_unref(&hw_device_ctx);
}
} // end if video_out_stream
if (audio_out_stream) {