| Message ID | AM7PR03MB6660F800C8ABC9F5EC9FD7058FEF9@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,01/10] avcodec/mips/constants: Include intfloat.h in constants.h | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
Andreas Rheinhardt (12021-08-02): > The reasons for including them don't exist any longer: ff_tlog() has > been moved to libavutil/internal.h and FF_QSCALE_TYPE_* has been moved > to qp_table.h. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > The following headers are now no longer provided by > libavfilter/internal.h: > libavcodec/avcodec.h libavcodec/codec.h libavutil/hwcontext.h > libavcodec/codec_id.h libavcodec/codec_desc.h libavcodec/codec_par.h > libavcodec/defs.h libavcodec/packet.h libavcodec/version.h > libavcodec/internal.h libavutil/channel_layout.h libavutil/fifo.h > libavcodec/bsf.h LGTM. Regards,
Nicolas George: > Andreas Rheinhardt (12021-08-02): >> The reasons for including them don't exist any longer: ff_tlog() has >> been moved to libavutil/internal.h and FF_QSCALE_TYPE_* has been moved >> to qp_table.h. >> >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> >> --- >> The following headers are now no longer provided by >> libavfilter/internal.h: >> libavcodec/avcodec.h libavcodec/codec.h libavutil/hwcontext.h >> libavcodec/codec_id.h libavcodec/codec_desc.h libavcodec/codec_par.h >> libavcodec/defs.h libavcodec/packet.h libavcodec/version.h >> libavcodec/internal.h libavutil/channel_layout.h libavutil/fifo.h >> libavcodec/bsf.h > > LGTM. > > Regards, > Does this LGTM also pertain to the preceding two patches (which remove the reasons for including these headers)? - Andreas
Andreas Rheinhardt (12021-08-03): > Does this LGTM also pertain to the preceding two patches (which remove > the reasons for including these headers)? No. Patch #7 looks ok, but I do not maintain that file. I do not have expertise to judge #6. Regards,
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index db8aa029c4..72d795f8ee 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -37,6 +37,8 @@ #include "libavutil/timestamp.h" #include "libavutil/samplefmt.h" +#include "libavcodec/defs.h" + #include "audio.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 6443c2fd1d..ac609ab9cb 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -31,6 +31,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/cpu.h" +#include "libavcodec/defs.h" #include "../internal.h" #include "dnn_backend_native_layer_pad.h" #include "dnn_backend_native_layer_maximum.h" diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 61a1279b2f..6a4c546b4b 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -32,8 +32,6 @@ #include "thread.h" #include "version.h" #include "video.h" -#include "libavcodec/avcodec.h" -#include "libavcodec/internal.h" typedef struct AVFilterCommand { double time; ///< time expressed in seconds diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index b70d48e515..7029963e29 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -32,6 +32,7 @@ #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavcodec/avcodec.h" #include "internal.h" #include "qp_table.h" #include "avfilter.h" diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 11ee490935..9390c80dda 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/eval.h" +#include "libavutil/hwcontext.h" #include "libavutil/pixdesc.h" #include "libavutil/mathematics.h" diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c index 5099f0a806..95267d6a1c 100644 --- a/libavfilter/vf_yadif_cuda.c +++ b/libavfilter/vf_yadif_cuda.c @@ -19,6 +19,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/hwcontext.h" #include "libavutil/hwcontext_cuda_internal.h" #include "libavutil/cuda_check.h" #include "internal.h"
The reasons for including them don't exist any longer: ff_tlog() has been moved to libavutil/internal.h and FF_QSCALE_TYPE_* has been moved to qp_table.h. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- The following headers are now no longer provided by libavfilter/internal.h: libavcodec/avcodec.h libavcodec/codec.h libavutil/hwcontext.h libavcodec/codec_id.h libavcodec/codec_desc.h libavcodec/codec_par.h libavcodec/defs.h libavcodec/packet.h libavcodec/version.h libavcodec/internal.h libavutil/channel_layout.h libavutil/fifo.h libavcodec/bsf.h libavfilter/af_ashowinfo.c | 2 ++ libavfilter/dnn/dnn_backend_tf.c | 1 + libavfilter/internal.h | 2 -- libavfilter/vf_uspp.c | 1 + libavfilter/vf_vpp_qsv.c | 1 + libavfilter/vf_yadif_cuda.c | 1 + 6 files changed, 6 insertions(+), 2 deletions(-)