Skip to content

Commit ae84aa7

Browse files
committed
swscale/utils: split off format code into new file
utils.c is getting quite crowded, and I need a new place to dump a lot of format handling code for the ongoing rewrite. Rather than bloating this file even more, start splitting format handling helpers off into a new file. This also renames the existing utils.h header, which didn't really contain anything except the SwsFormat definition anyway (the prototypes for what should have been in utils.h are all still in the legacy swscale_internal.h).
1 parent e4c8e80 commit ae84aa7

File tree

10 files changed

+592
-568
lines changed

10 files changed

+592
-568
lines changed

libswscale/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ OBJS = alphablend.o \
1010
csputils.o \
1111
hscale.o \
1212
hscale_fast_bilinear.o \
13+
format.o \
1314
gamma.o \
1415
graph.o \
1516
half2float.o \

libswscale/cms.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "cms.h"
3030
#include "csputils.h"
3131
#include "libswscale/swscale.h"
32-
#include "utils.h"
32+
#include "format.h"
3333

3434
bool ff_sws_color_map_noop(const SwsColorMap *map)
3535
{

libswscale/cms.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "csputils.h"
2929
#include "swscale.h"
30-
#include "utils.h"
30+
#include "format.h"
3131

3232
/* Minimum, maximum, and default knee point for perceptual tone mapping [0,1] */
3333
#define PERCEPTUAL_KNEE_MIN 0.10f

libswscale/csputils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "libavutil/csp.h"
2222

2323
#include "csputils.h"
24-
#include "utils.h"
24+
#include "format.h"
2525

2626
void ff_sws_matrix3x3_mul(SwsMatrix3x3 *a, const SwsMatrix3x3 *b)
2727
{

0 commit comments

Comments
 (0)