virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mpeg12dec: Really disable scratchpad allocations

Browse Source 
ba341be095 disabled them for
the main thread only, not the slice threads.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-02-25 16:40:56 +01:00
parent 4f2becc2dc
commit 8d87162254
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpeg12dec.c
View File

@@ -1001,7 +1001,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
if ((ret = ff_mpv_common_init(s)) < 0) if ((ret = ff_mpv_common_init(s)) < 0)
return ret; return ret;
if (!s->avctx->lowres) if (!s->avctx->lowres)
ff_mpv_framesize_disable(&s->sc); for (int i = 0; i < s->slice_context_count; i++)
ff_mpv_framesize_disable(&s->thread_context[i]->sc);
} }
return 0; return 0;
} }
@@ -1874,7 +1875,8 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
if ((ret = ff_mpv_common_init(s)) < 0) if ((ret = ff_mpv_common_init(s)) < 0)
return ret; return ret;
if (!s->avctx->lowres) if (!s->avctx->lowres)
ff_mpv_framesize_disable(&s->sc); for (int i = 0; i < s->slice_context_count; i++)
ff_mpv_framesize_disable(&s->thread_context[i]->sc);
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
int j = s->idsp.idct_permutation[i]; int j = s->idsp.idct_permutation[i];