| Message ID | AM7PR03MB66602E5A5158490ECDA4F93A8F349@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 321a3c244d0a89b2826c38611284cc403a9808fa |
| Headers | show |
| Series | [FFmpeg-devel] avutil/x86/emms: Don't unnecessarily include lavu/cpu.h | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/configure_loongarch64 | warning | Failed to run configure |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On Tue, 15 Feb 2022, Andreas Rheinhardt wrote: > It has been included since af5f434f8c0fb3b4ee3b206ebc1946ca660a8abe > for deprecation reasons, but removing it has been forgotten after > it had served is purpose. So remove it. > > For convenience, include version.h instead as LIBAVUTIL_VERSION_INT > is supposed to be used when creating AVClasses. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/ffjni.c | 1 + > libavcodec/libopenh264.c | 1 + > libavformat/avc.h | 1 + > libavformat/data_uri.c | 1 + > libavformat/ip.c | 2 ++ > libavutil/cuda_check.h | 1 + > libavutil/log.h | 2 +- > libavutil/tests/camellia.c | 4 ++++ > libavutil/tests/cast5.c | 4 ++++ > libavutil/tests/twofish.c | 2 ++ > libavutil/thread.h | 4 ++++ > libavutil/timecode.c | 1 + > libavutil/timer.h | 1 + > tools/ffescape.c | 6 ++++++ > 14 files changed, 30 insertions(+), 1 deletion(-) LGTM // Martin
diff --git a/libavcodec/ffjni.c b/libavcodec/ffjni.c index f5b581f0f6..154be9ae99 100644 --- a/libavcodec/ffjni.c +++ b/libavcodec/ffjni.c @@ -26,6 +26,7 @@ #include "libavutil/bprint.h" #include "libavutil/log.h" +#include "libavutil/mem.h" #include "config.h" #include "jni.h" diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c index 59c61a3a4c..0f6d28ed88 100644 --- a/libavcodec/libopenh264.c +++ b/libavcodec/libopenh264.c @@ -23,6 +23,7 @@ #include <wels/codec_api.h> #include <wels/codec_ver.h> +#include "libavutil/error.h" #include "libavutil/log.h" #include "libopenh264.h" diff --git a/libavformat/avc.h b/libavformat/avc.h index aced285c7a..0ce95c194e 100644 --- a/libavformat/avc.h +++ b/libavformat/avc.h @@ -23,6 +23,7 @@ #define AVFORMAT_AVC_H #include <stdint.h> +#include "libavutil/rational.h" #include "avio.h" typedef struct NALU { diff --git a/libavformat/data_uri.c b/libavformat/data_uri.c index 1863830abe..28eb2b9e08 100644 --- a/libavformat/data_uri.c +++ b/libavformat/data_uri.c @@ -20,6 +20,7 @@ #include <string.h> #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/base64.h" #include "url.h" diff --git a/libavformat/ip.c b/libavformat/ip.c index 70c5529b72..b2c7ef07e5 100644 --- a/libavformat/ip.c +++ b/libavformat/ip.c @@ -18,8 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> #include "ip.h" #include "libavutil/avstring.h" +#include "libavutil/mem.h" static int compare_addr(const struct sockaddr_storage *a, const struct sockaddr_storage *b) diff --git a/libavutil/cuda_check.h b/libavutil/cuda_check.h index 3aea085c07..f5a9234eaf 100644 --- a/libavutil/cuda_check.h +++ b/libavutil/cuda_check.h @@ -21,6 +21,7 @@ #define AVUTIL_CUDA_CHECK_H #include "compat/cuda/dynlink_loader.h" +#include "error.h" typedef CUresult CUDAAPI cuda_check_GetErrorName(CUresult error, const char** pstr); typedef CUresult CUDAAPI cuda_check_GetErrorString(CUresult error, const char** pstr); diff --git a/libavutil/log.h b/libavutil/log.h index 99625af538..ab7ceabe22 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -22,8 +22,8 @@ #define AVUTIL_LOG_H #include <stdarg.h> -#include "avutil.h" #include "attributes.h" +#include "version.h" typedef enum { AV_CLASS_CATEGORY_NA = 0, diff --git a/libavutil/tests/camellia.c b/libavutil/tests/camellia.c index 1716b59a38..9fdd6cd7e8 100644 --- a/libavutil/tests/camellia.c +++ b/libavutil/tests/camellia.c @@ -19,8 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stddef.h> +#include <string.h> + #include "libavutil/camellia.h" #include "libavutil/log.h" +#include "libavutil/mem.h" int main(int argc, char *argv[]) { diff --git a/libavutil/tests/cast5.c b/libavutil/tests/cast5.c index ce3aa80b5b..1ba3075e73 100644 --- a/libavutil/tests/cast5.c +++ b/libavutil/tests/cast5.c @@ -19,8 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stddef.h> +#include <string.h> + #include "libavutil/cast5.h" #include "libavutil/log.h" +#include "libavutil/mem.h" int main(int argc, char** argv) { diff --git a/libavutil/tests/twofish.c b/libavutil/tests/twofish.c index 7e8b129230..a4ccbfd379 100644 --- a/libavutil/tests/twofish.c +++ b/libavutil/tests/twofish.c @@ -20,10 +20,12 @@ */ #include "libavutil/log.h" +#include "libavutil/mem.h" #include "libavutil/twofish.h" #include <stdio.h> #include <stdlib.h> +#include <string.h> int main(int argc, char *argv[]) { diff --git a/libavutil/thread.h b/libavutil/thread.h index be5c4b1340..7106fd0d47 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -31,7 +31,11 @@ #if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 +#include <stdlib.h> + +#include "error.h" #include "log.h" +#include "macros.h" #define ASSERT_PTHREAD_ABORT(func, ret) do { \ char errbuf[AV_ERROR_MAX_STRING_SIZE] = ""; \ diff --git a/libavutil/timecode.c b/libavutil/timecode.c index 2fc3295e25..a37d725fc7 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -27,6 +27,7 @@ */ #include <stdio.h> +#include "common.h" #include "timecode.h" #include "log.h" #include "error.h" diff --git a/libavutil/timer.h b/libavutil/timer.h index 71ea2f912e..48e576739f 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -48,6 +48,7 @@ #include <mach/mach_time.h> #endif +#include "common.h" #include "log.h" #if ARCH_AARCH64 diff --git a/tools/ffescape.c b/tools/ffescape.c index 1ed8daa801..441e2fd01b 100644 --- a/tools/ffescape.c +++ b/tools/ffescape.c @@ -19,12 +19,18 @@ */ #include "config.h" +#include <errno.h> +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #if HAVE_UNISTD_H #include <unistd.h> /* getopt */ #endif #include "libavutil/log.h" #include "libavutil/bprint.h" +#include "libavutil/mem.h" #if !HAVE_GETOPT #include "compat/getopt.c"
It has been included since af5f434f8c0fb3b4ee3b206ebc1946ca660a8abe for deprecation reasons, but removing it has been forgotten after it had served is purpose. So remove it. For convenience, include version.h instead as LIBAVUTIL_VERSION_INT is supposed to be used when creating AVClasses. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/ffjni.c | 1 + libavcodec/libopenh264.c | 1 + libavformat/avc.h | 1 + libavformat/data_uri.c | 1 + libavformat/ip.c | 2 ++ libavutil/cuda_check.h | 1 + libavutil/log.h | 2 +- libavutil/tests/camellia.c | 4 ++++ libavutil/tests/cast5.c | 4 ++++ libavutil/tests/twofish.c | 2 ++ libavutil/thread.h | 4 ++++ libavutil/timecode.c | 1 + libavutil/timer.h | 1 + tools/ffescape.c | 6 ++++++ 14 files changed, 30 insertions(+), 1 deletion(-)