| Message ID | 20210106231308.2952217-1-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | da607832b57607fe9221bc2ecd25ea25ef6dd3aa |
| Headers | show |
| Series | [FFmpeg-devel,1/5] avcodec/tableprint: Don't include mem_internal.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: > tableprint.h does not declare anything as aligned; it just prints > DECLARE_ALIGNED. So it can be removed; in fact, it needs to be removed, > because mem_internal.h includes config.h which leads to warnings when > building with hardcoded tables enabled because of redefinitions of > CONFIG_HARDCODED_TABLES. > > (Furthermore, config.h is only valid for the target, not the host, > so HAVE_LOCAL_ALIGNED might even be wrong here.) > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavcodec/tableprint.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h > index e57eeb6ca6..6f61c7124b 100644 > --- a/libavcodec/tableprint.h > +++ b/libavcodec/tableprint.h > @@ -27,7 +27,6 @@ > #include <stdio.h> > > #include "libavutil/common.h" > -#include "libavutil/mem_internal.h" > > #define WRITE_1D_FUNC_ARGV(type, linebrk, fmtstr, ...)\ > void write_##type##_array(const type *data, int len)\ > Will apply this patch tomorrow unless there are objections. - Andreas
diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h index e57eeb6ca6..6f61c7124b 100644 --- a/libavcodec/tableprint.h +++ b/libavcodec/tableprint.h @@ -27,7 +27,6 @@ #include <stdio.h> #include "libavutil/common.h" -#include "libavutil/mem_internal.h" #define WRITE_1D_FUNC_ARGV(type, linebrk, fmtstr, ...)\ void write_##type##_array(const type *data, int len)\
tableprint.h does not declare anything as aligned; it just prints DECLARE_ALIGNED. So it can be removed; in fact, it needs to be removed, because mem_internal.h includes config.h which leads to warnings when building with hardcoded tables enabled because of redefinitions of CONFIG_HARDCODED_TABLES. (Furthermore, config.h is only valid for the target, not the host, so HAVE_LOCAL_ALIGNED might even be wrong here.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavcodec/tableprint.h | 1 - 1 file changed, 1 deletion(-)