diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-01 08:36:09 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-24 12:56:49 +0100 |
| commit | 636631d9db82f5e86330ab42dacc8a106684b349 (patch) | |
| tree | 86274afefd600d2ef634dc8d1252807ce9f16721 /libswscale | |
| parent | 84f16bb5e68dc47eca4dc96b3391c58471cd7328 (diff) | |
Remove unnecessary libavutil/(avutil|common|internal).h inclusions
Some of these were made possible by moving several common macros to
libavutil/macros.h.
While just at it, also improve the other headers a bit.
Reviewed-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/input.c | 6 | ||||
| -rw-r--r-- | libswscale/options.c | 2 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.h | 5 | ||||
| -rw-r--r-- | libswscale/swscale.c | 8 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 1 |
5 files changed, 3 insertions, 19 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 6acc39f89f..fe0c27d743 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -21,17 +21,11 @@ #include <math.h> #include <stdint.h> #include <stdio.h> -#include <string.h> -#include "libavutil/avutil.h" #include "libavutil/bswap.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mathematics.h" -#include "libavutil/pixdesc.h" #include "libavutil/avassert.h" #include "config.h" -#include "rgb2rgb.h" -#include "swscale.h" #include "swscale_internal.h" #define input_pixel(pos) (isBE(origin) ? AV_RB16(pos) : AV_RL16(pos)) diff --git a/libswscale/options.c b/libswscale/options.c index f6ea9e1f9d..4d41b835b1 100644 --- a/libswscale/options.c +++ b/libswscale/options.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avutil.h" #include "libavutil/opt.h" -#include "libavutil/pixfmt.h" #include "swscale.h" #include "swscale_internal.h" diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index 48bba1586a..7272e98c57 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -26,10 +26,7 @@ #ifndef SWSCALE_RGB2RGB_H #define SWSCALE_RGB2RGB_H -#include <inttypes.h> - -#include "libavutil/avutil.h" -#include "swscale.h" +#include <stdint.h> /* A full collection of RGB to RGB(BGR) converters */ extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size); diff --git a/libswscale/swscale.c b/libswscale/swscale.c index feef3482d2..3ed547d526 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -18,22 +18,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <inttypes.h> -#include <math.h> +#include <stdint.h> #include <stdio.h> #include <string.h> #include "libavutil/avassert.h" -#include "libavutil/avutil.h" #include "libavutil/bswap.h" +#include "libavutil/common.h" #include "libavutil/cpu.h" -#include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mathematics.h" #include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" #include "config.h" -#include "rgb2rgb.h" #include "swscale_internal.h" #include "swscale.h" diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 3cf96d5fbc..e118b54457 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -26,7 +26,6 @@ #include "config.h" #include "libavutil/avassert.h" -#include "libavutil/avutil.h" #include "libavutil/common.h" #include "libavutil/frame.h" #include "libavutil/intreadwrite.h" |