scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 17:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavc JPEG: fixed broken JPEG if threads=no

Browse Source 
Fixed broken JPEG produced by current FFmpeg if slices > 1 and
threads = 1.
This commit is contained in:
Martin Pulec
2021-11-24 18:45:13 +01:00
parent 6441d36f56
commit e0f2ddeb57
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/video_compress/libavcodec.cpp
View File

@@ -781,7 +781,8 @@ bool set_codec_ctx_params(struct state_video_compress_libav *s, AVPixelFormat pi
codec_params[ug_codec].set_param(s->codec_ctx, &s->params);
set_thread_mode(s->codec_ctx, &s->params);
s->codec_ctx->slices = max(s->params.thread_count, MIN_SLICE_COUNT);
// currently FFmpeg JPEG encoder produces broken JPEGs if not using encoding threads and slices > 1
s->codec_ctx->slices = s->codec_ctx->codec_id != AV_CODEC_ID_MJPEG || s->codec_ctx->thread_count > 1 ? max(s->params.thread_count, MIN_SLICE_COUNT) : 1;
if (!s->params.have_preset) {
string preset{};