| Message ID | DM6PR11MB2681EF0B33052C1515776923B1769@DM6PR11MB2681.namprd11.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] vcodec/vp8data: Make ff_vp8_dct_cat_prob static | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 5/8/2023 10:49 PM, Dai, Jianhui J wrote: > Avoid compiling error if included by multiple sources. > > Signed-off-by: Jianhui Dai <jianhui.j.dai@intel.com> > --- > libavcodec/vp8data.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h > index 1fcce134eb..ac4af5f733 100644 > --- a/libavcodec/vp8data.h > +++ b/libavcodec/vp8data.h > @@ -353,7 +353,7 @@ static const uint8_t vp8_dct_cat6_prob[] = { > }; > > // only used for cat3 and above; cat 1 and 2 are referenced directly > -const uint8_t *const ff_vp8_dct_cat_prob[] = { > +static const uint8_t *const ff_vp8_dct_cat_prob[] = { > vp8_dct_cat3_prob, > vp8_dct_cat4_prob, > vp8_dct_cat5_prob, This is also used by the ARM assembly, so it needs to be moved to a new vp8data.c file, leaving the prototype here using the extern attribute.
Thank for the suggestion. In a WIP patch, I try to reuse ` vp8_token_update_probs` by include vp8data.h; But face the compiling error with ` ff_vp8_dct_cat_prob`. Let me move ` ff_vp8_dct_cat_prob` to vp8data.c at first. Jianhui Dai -----Original Message----- From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of James Almer Sent: Tuesday, May 9, 2023 10:04 AM To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] [PATCH] vcodec/vp8data: Make ff_vp8_dct_cat_prob static On 5/8/2023 10:49 PM, Dai, Jianhui J wrote: > Avoid compiling error if included by multiple sources. > > Signed-off-by: Jianhui Dai <jianhui.j.dai@intel.com> > --- > libavcodec/vp8data.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index > 1fcce134eb..ac4af5f733 100644 > --- a/libavcodec/vp8data.h > +++ b/libavcodec/vp8data.h > @@ -353,7 +353,7 @@ static const uint8_t vp8_dct_cat6_prob[] = { > }; > > // only used for cat3 and above; cat 1 and 2 are referenced directly > -const uint8_t *const ff_vp8_dct_cat_prob[] = { > +static const uint8_t *const ff_vp8_dct_cat_prob[] = { > vp8_dct_cat3_prob, > vp8_dct_cat4_prob, > vp8_dct_cat5_prob, This is also used by the ARM assembly, so it needs to be moved to a new vp8data.c file, leaving the prototype here using the extern attribute.
diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index 1fcce134eb..ac4af5f733 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -353,7 +353,7 @@ static const uint8_t vp8_dct_cat6_prob[] = { }; // only used for cat3 and above; cat 1 and 2 are referenced directly -const uint8_t *const ff_vp8_dct_cat_prob[] = { +static const uint8_t *const ff_vp8_dct_cat_prob[] = { vp8_dct_cat3_prob, vp8_dct_cat4_prob, vp8_dct_cat5_prob,
Avoid compiling error if included by multiple sources. Signed-off-by: Jianhui Dai <jianhui.j.dai@intel.com> --- libavcodec/vp8data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)