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

libavcodec/jpeg2000: Make tag tree functions non static

Browse Source 
This patch makes the tag_tree_zero() and tag_tree_size()
functions non static and callable from other files.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Gautam Ramakrishnan
2020-08-28 00:15:33 +05:30
committed by Michael Niedermayer
parent 659658d08b
commit 87567fc398
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/jpeg2000.c
View File

@@ -39,7 +39,7 @@
/* tag tree routines */ /* tag tree routines */
/* allocate the memory for tag tree */ /* allocate the memory for tag tree */
static int32_t tag_tree_size(int w, int h) int32_t ff_tag_tree_size(int w, int h)
{ {
int64_t res = 0; int64_t res = 0;
while (w > 1 || h > 1) { while (w > 1 || h > 1) {
@@ -57,7 +57,7 @@ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h)
Jpeg2000TgtNode *res, *t, *t2; Jpeg2000TgtNode *res, *t, *t2;
int32_t tt_size; int32_t tt_size;
tt_size = tag_tree_size(w, h); tt_size = ff_tag_tree_size(w, h);
t = res = av_mallocz_array(tt_size, sizeof(*t)); t = res = av_mallocz_array(tt_size, sizeof(*t));
if (!res) if (!res)
@@ -82,9 +82,9 @@ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h)
return res; return res;
} }
static void tag_tree_zero(Jpeg2000TgtNode *t, int w, int h) void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h)
{ {
int i, siz = tag_tree_size(w, h); int i, siz = ff_tag_tree_size(w, h);
for (i = 0; i < siz; i++) { for (i = 0; i < siz; i++) {
t[i].val = 0; t[i].val = 0;
@@ -567,8 +567,8 @@ void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty)
Jpeg2000Band *band = rlevel->band + bandno; Jpeg2000Band *band = rlevel->band + bandno;
for(precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) { for(precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) {
Jpeg2000Prec *prec = band->prec + precno; Jpeg2000Prec *prec = band->prec + precno;
tag_tree_zero(prec->zerobits, prec->nb_codeblocks_width, prec->nb_codeblocks_height); ff_tag_tree_zero(prec->zerobits, prec->nb_codeblocks_width, prec->nb_codeblocks_height);
tag_tree_zero(prec->cblkincl, prec->nb_codeblocks_width, prec->nb_codeblocks_height); ff_tag_tree_zero(prec->cblkincl, prec->nb_codeblocks_width, prec->nb_codeblocks_height);
for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) { for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) {
Jpeg2000Cblk *cblk = prec->cblk + cblkno; Jpeg2000Cblk *cblk = prec->cblk + cblkno;
cblk->length = 0; cblk->length = 0;

3
libavcodec/jpeg2000.h
View File

@@ -290,4 +290,7 @@ static inline int needs_termination(int style, int passno) {
return 0; return 0;
} }
int32_t ff_tag_tree_size(int w, int h);
void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h);
#endif /* AVCODEC_JPEG2000_H */ #endif /* AVCODEC_JPEG2000_H */