| Message ID | AS8P250MB07446F52069C745F755071728F539@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | a91ddce6894af70ed7389eaf2a84f844e9f7b7e9 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avcodec/dirac_dwt(_template): Don't use ff_-prefix for static func | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/dirac_dwt.c | 6 +++--- > libavcodec/dirac_dwt_template.c | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c > index af29932c6d..4039899cf0 100644 > --- a/libavcodec/dirac_dwt.c > +++ b/libavcodec/dirac_dwt.c > @@ -45,11 +45,11 @@ int ff_spatial_idwt_init(DWTContext *d, DWTPlane *p, enum dwt_type type, > d->decomposition_count = decomposition_count; > > if (bit_depth == 8) > - ret = ff_spatial_idwt_init_8bit(d, type); > + ret = spatial_idwt_init_8bit(d, type); > else if (bit_depth == 10) > - ret = ff_spatial_idwt_init_10bit(d, type); > + ret = spatial_idwt_init_10bit(d, type); > else if (bit_depth == 12) > - ret = ff_spatial_idwt_init_12bit(d, type); > + ret = spatial_idwt_init_12bit(d, type); > else > av_log(NULL, AV_LOG_WARNING, "Unsupported bit depth = %i\n", bit_depth); > > diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c > index 5d55d932a1..f1d7f8b22f 100644 > --- a/libavcodec/dirac_dwt_template.c > +++ b/libavcodec/dirac_dwt_template.c > @@ -516,7 +516,7 @@ static void RENAME(spatial_compose_dd137i_init)(DWTCompose *cs, uint8_t *buffer, > cs->y = -5; > } > > -static int RENAME(ff_spatial_idwt_init)(DWTContext *d, enum dwt_type type) > +static int RENAME(spatial_idwt_init)(DWTContext *d, enum dwt_type type) > { > int level; > Will apply tonight unless there are objections. - Andreas
Sep 28, 2022, 03:05 by andreas.rheinhardt@outlook.com: > Andreas Rheinhardt: > >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> >> --- >> libavcodec/dirac_dwt.c | 6 +++--- >> libavcodec/dirac_dwt_template.c | 2 +- >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c >> index af29932c6d..4039899cf0 100644 >> --- a/libavcodec/dirac_dwt.c >> +++ b/libavcodec/dirac_dwt.c >> @@ -45,11 +45,11 @@ int ff_spatial_idwt_init(DWTContext *d, DWTPlane *p, enum dwt_type type, >> d->decomposition_count = decomposition_count; >> >> if (bit_depth == 8) >> - ret = ff_spatial_idwt_init_8bit(d, type); >> + ret = spatial_idwt_init_8bit(d, type); >> else if (bit_depth == 10) >> - ret = ff_spatial_idwt_init_10bit(d, type); >> + ret = spatial_idwt_init_10bit(d, type); >> else if (bit_depth == 12) >> - ret = ff_spatial_idwt_init_12bit(d, type); >> + ret = spatial_idwt_init_12bit(d, type); >> else >> av_log(NULL, AV_LOG_WARNING, "Unsupported bit depth = %i\n", bit_depth); >> >> diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c >> index 5d55d932a1..f1d7f8b22f 100644 >> --- a/libavcodec/dirac_dwt_template.c >> +++ b/libavcodec/dirac_dwt_template.c >> @@ -516,7 +516,7 @@ static void RENAME(spatial_compose_dd137i_init)(DWTCompose *cs, uint8_t *buffer, >> cs->y = -5; >> } >> >> -static int RENAME(ff_spatial_idwt_init)(DWTContext *d, enum dwt_type type) >> +static int RENAME(spatial_idwt_init)(DWTContext *d, enum dwt_type type) >> { >> int level; >> > > Will apply tonight unless there are objections. > LGTM
diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c index af29932c6d..4039899cf0 100644 --- a/libavcodec/dirac_dwt.c +++ b/libavcodec/dirac_dwt.c @@ -45,11 +45,11 @@ int ff_spatial_idwt_init(DWTContext *d, DWTPlane *p, enum dwt_type type, d->decomposition_count = decomposition_count; if (bit_depth == 8) - ret = ff_spatial_idwt_init_8bit(d, type); + ret = spatial_idwt_init_8bit(d, type); else if (bit_depth == 10) - ret = ff_spatial_idwt_init_10bit(d, type); + ret = spatial_idwt_init_10bit(d, type); else if (bit_depth == 12) - ret = ff_spatial_idwt_init_12bit(d, type); + ret = spatial_idwt_init_12bit(d, type); else av_log(NULL, AV_LOG_WARNING, "Unsupported bit depth = %i\n", bit_depth); diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c index 5d55d932a1..f1d7f8b22f 100644 --- a/libavcodec/dirac_dwt_template.c +++ b/libavcodec/dirac_dwt_template.c @@ -516,7 +516,7 @@ static void RENAME(spatial_compose_dd137i_init)(DWTCompose *cs, uint8_t *buffer, cs->y = -5; } -static int RENAME(ff_spatial_idwt_init)(DWTContext *d, enum dwt_type type) +static int RENAME(spatial_idwt_init)(DWTContext *d, enum dwt_type type) { int level;
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/dirac_dwt.c | 6 +++--- libavcodec/dirac_dwt_template.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)