History

avcodec/mpeg12dec: Really disable scratchpad allocations

ba341be09533a077075c71fce5f9dc5b73504234 disabled them for the main thread only, not the slice threads.

Andreas Rheinhardt committed 1 year ago

Commit 8d871621 parent 4f2becc1 file · +4 −2Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/mpeg12dec.c+4−2
@@ -1001,7 +1001,8 @@ FF_ENABLE_DEPRECATION_WARNINGS · 1000 unmodified lines
10011001 if ((ret = ff_mpv_common_init(s)) < 0)
10021002 return ret;
10031003 if (!s->avctx->lowres)
1004− ff_mpv_framesize_disable(&s->sc);
1004+ for (int i = 0; i < s->slice_context_count; i++)
1005+ ff_mpv_framesize_disable(&s->thread_context[i]->sc);
10051006 }
10061007 return 0;
10071008 }
@@ -1874,7 +1875,8 @@ static int vcr2_init_sequence(AVCodecContext *avctx) · 866 unmodified lines
18741875 if ((ret = ff_mpv_common_init(s)) < 0)
18751876 return ret;
18761877 if (!s->avctx->lowres)
1877− ff_mpv_framesize_disable(&s->sc);
1878+ for (int i = 0; i < s->slice_context_count; i++)
1879+ ff_mpv_framesize_disable(&s->thread_context[i]->sc);
18781880
18791881 for (i = 0; i < 64; i++) {
18801882 int j = s->idsp.idct_permutation[i];

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t