[FFmpeg-devel] [PATCH] avutil/internal: remove timer.h again

Anton Khirnov anton at khirnov.net
Tue Apr 11 14:34:11 EEST 2023


Quoting Zhao Zhili (2023-04-05 16:50:08)
> From: Zhao Zhili <zhilizhao at tencent.com>
> 
> timer.h has been removed from internal.h, and then added back with
> 3e6088f for convenience. This patch removed it again for the
> following reasons:
> 
> 1. Only includes what's necessary is a common and safe strategy.
> 
> 2. It fixed some build errors on Android:
>   a. libavutil/timer.h includes sys/ioctl.h, and ioctl.h includes
>      termios.h on Android.
>   b. termios.h reserves names prefixed with ‘c_’, ‘V’, ‘I’, ‘O’, and
>      ‘TC’; and names prefixed with ‘B’ followed by a digit.
>   c. libavcodec uses B0 B1 and so on as variable names a lot. So
>      the code failed to build with --enable-linux-perf, or
>      --target-os=Linux.
> ---
>  libavutil/internal.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/libavutil/internal.h b/libavutil/internal.h
> index 454c59aa50..001103142b 100644
> --- a/libavutil/internal.h
> +++ b/libavutil/internal.h
> @@ -40,7 +40,6 @@
>  #include <stdio.h>
>  #include "config.h"
>  #include "attributes.h"
> -#include "timer.h"
>  #include "macros.h"
>  #include "pixfmt.h"

I am in favor of this.

-- 
Anton Khirnov


More information about the ffmpeg-devel mailing list