| Message ID | GV1P250MB0737280B14FF3E29DF31B3B48F352@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | e465cebfeed422b31bc30fc010bc6d21b44cbea3 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/Makefile: Remove redundant dependencies on hevc_data.o | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > hevc_data.c only provides ff_hevc_diag_scan tables and > neither the QSV HEVC encoder nor the HEVC parser use these > directly and the indirect dependency is already accounted > for in the dependencies of the hevcparse subsystem since > b0c61209cd30f9ddf3356d5ded6df488f25d1bd5, so remove these > spurious dependencies. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/Makefile | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 9ce6d445c1..6eefeeae6e 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -440,8 +440,7 @@ OBJS-$(CONFIG_HEVC_MEDIACODEC_ENCODER) += mediacodecenc.o > OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o > OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o nvenc.o > OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o > -OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \ > - hevc_data.o > +OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o > OBJS-$(CONFIG_HEVC_RKMPP_DECODER) += rkmppdec.o > OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o h265_profile_level.o \ > h2645data.o > @@ -1196,7 +1195,7 @@ OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o > OBJS-$(CONFIG_H261_PARSER) += h261_parser.o > OBJS-$(CONFIG_H263_PARSER) += h263_parser.o > OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264data.o > -OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o > +OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o > OBJS-$(CONFIG_HDR_PARSER) += hdr_parser.o > OBJS-$(CONFIG_IPU_PARSER) += ipu_parser.o > OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o Will apply this patch tomorrow unless there are objections. - Andreas
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9ce6d445c1..6eefeeae6e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -440,8 +440,7 @@ OBJS-$(CONFIG_HEVC_MEDIACODEC_ENCODER) += mediacodecenc.o OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o nvenc.o OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o -OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \ - hevc_data.o +OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o OBJS-$(CONFIG_HEVC_RKMPP_DECODER) += rkmppdec.o OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o h265_profile_level.o \ h2645data.o @@ -1196,7 +1195,7 @@ OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264data.o -OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o +OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o OBJS-$(CONFIG_HDR_PARSER) += hdr_parser.o OBJS-$(CONFIG_IPU_PARSER) += ipu_parser.o OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o
hevc_data.c only provides ff_hevc_diag_scan tables and neither the QSV HEVC encoder nor the HEVC parser use these directly and the indirect dependency is already accounted for in the dependencies of the hevcparse subsystem since b0c61209cd30f9ddf3356d5ded6df488f25d1bd5, so remove these spurious dependencies. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)