summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorZhao Zhili <zhilizhao@tencent.com>2023-04-05 22:50:08 +0800
committerZhao Zhili <zhilizhao@tencent.com>2023-04-15 04:21:33 +0800
commitf0f596dbc6b45b544d2d2d4fb78c0a2bdc3e6eb1 (patch)
tree00bc289b4afc1ac6fdfd5fa6ad5336de474328c2 /libavutil
parenteb96cfbf57822f7ce0af508d4a9ecd2224cbd565 (diff)
downloadffmpeg-f0f596dbc6b45b544d2d2d4fb78c0a2bdc3e6eb1.tar.gz
avutil/internal: remove timer.h again
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. Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/internal.h1
1 files changed, 0 insertions, 1 deletions
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"