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

Unified · Split

libavcodec/mpeg12dec.c+4−2
@@ -1001,7 +1001,8 @@ FF_ENABLE_DEPRECATION_WARNINGS · 1000 unmodified lines
1001 if ((ret = ff_mpv_common_init(s)) < 0)1001 if ((ret = ff_mpv_common_init(s)) < 0)
1002 return ret;1002 return ret;
1003 if (!s->avctx->lowres)1003 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);
1005 }1006 }
1006 return 0;1007 return 0;
1007}1008}
@@ -1874,7 +1875,8 @@ static int vcr2_init_sequence(AVCodecContext *avctx) · 866 unmodified lines
1874 if ((ret = ff_mpv_common_init(s)) < 0)1875 if ((ret = ff_mpv_common_init(s)) < 0)
1875 return ret;1876 return ret;
1876 if (!s->avctx->lowres)1877 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);
1878 1880
1879 for (i = 0; i < 64; i++) {1881 for (i = 0; i < 64; i++) {
1880 int j = s->idsp.idct_permutation[i];1882 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