summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gui/wm/ws.c2
-rw-r--r--Makefile14
-rw-r--r--libmpcodecs/vf_halfpack.c2
-rw-r--r--libmpcodecs/vf_palette.c2
-rw-r--r--libmpcodecs/vf_rgb2bgr.c2
-rw-r--r--libmpcodecs/vf_sab.c2
-rw-r--r--libmpcodecs/vf_scale.c2
-rw-r--r--libmpcodecs/vf_screenshot.c2
-rw-r--r--libmpcodecs/vf_smartblur.c2
-rw-r--r--libmpcodecs/vf_yuy2.c2
-rw-r--r--libswscale/Makefile (renamed from postproc/Makefile)0
-rw-r--r--libswscale/cs_test.c (renamed from postproc/cs_test.c)0
-rw-r--r--libswscale/rgb2rgb.c (renamed from postproc/rgb2rgb.c)0
-rw-r--r--libswscale/rgb2rgb.h (renamed from postproc/rgb2rgb.h)0
-rw-r--r--libswscale/rgb2rgb_template.c (renamed from postproc/rgb2rgb_template.c)0
-rw-r--r--libswscale/swscale-example.c (renamed from postproc/swscale-example.c)0
-rw-r--r--libswscale/swscale.c (renamed from postproc/swscale.c)0
-rw-r--r--libswscale/swscale.h (renamed from postproc/swscale.h)0
-rw-r--r--libswscale/swscale_altivec_template.c (renamed from postproc/swscale_altivec_template.c)0
-rw-r--r--libswscale/swscale_internal.h (renamed from postproc/swscale_internal.h)0
-rw-r--r--libswscale/swscale_template.c (renamed from postproc/swscale_template.c)0
-rw-r--r--libswscale/yuv2rgb.c (renamed from postproc/yuv2rgb.c)0
-rw-r--r--libswscale/yuv2rgb_altivec.c (renamed from postproc/yuv2rgb_altivec.c)0
-rw-r--r--libswscale/yuv2rgb_mlib.c (renamed from postproc/yuv2rgb_mlib.c)0
-rw-r--r--libswscale/yuv2rgb_template.c (renamed from postproc/yuv2rgb_template.c)0
-rw-r--r--libvo/mga_common.c2
-rw-r--r--libvo/vo_aa.c2
-rw-r--r--libvo/vo_vesa.c2
-rw-r--r--libvo/vo_x11.c2
-rw-r--r--libvo/vo_yuv4mpeg.c2
-rw-r--r--spudec.c2
31 files changed, 22 insertions, 22 deletions
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index 65fcd40ebc..66a54ad2ce 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -24,7 +24,7 @@
#include "ws.h"
#include "wsxdnd.h"
#include "../cpudetect.h"
-#include "../postproc/swscale.h"
+#include "../libswscale/swscale.h"
#include "../postproc/rgb2rgb.h"
#include "../libmpcodecs/vf_scale.h"
#include "../mp_msg.h"
diff --git a/Makefile b/Makefile
index 8c4f0fbe93..7bec636b85 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
$(W32_LIB) \
libaf/libaf.a \
libmpdemux/libmpdemux.a \
- postproc/libswscale.a \
+ libswscale/libswscale.a \
osdep/libosdep.a \
$(DVDREAD_LIB) \
$(DVDNAV_LIB) \
@@ -163,9 +163,9 @@ PARTS = libmpdemux \
libavcodec \
libpostproc \
libavformat \
+ libswscale \
libao2 \
osdep \
- postproc \
input \
libvo \
libaf \
@@ -218,7 +218,7 @@ COMMON_DEPS = $(W32_DEP) \
libmpcodecs/libmpcodecs.a \
libao2/libao2.a \
osdep/libosdep.a \
- postproc/libswscale.a \
+ libswscale/libswscale.a \
input/libinput.a \
libvo/libvo.a \
libaf/libaf.a \
@@ -302,6 +302,9 @@ libpostproc/libpostproc.a:
libavformat/libavformat.a:
$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a
+libswscale/libswscale.a:
+ $(MAKE) -C libswscale
+
libmpeg2/libmpeg2.a:
$(MAKE) -C libmpeg2
@@ -335,9 +338,6 @@ Gui/libgui.a:
osdep/libosdep.a:
$(MAKE) -C osdep
-postproc/libswscale.a:
- $(MAKE) -C postproc
-
input/libinput.a:
$(MAKE) -C input
@@ -583,7 +583,7 @@ libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])
libavutil/libavutil.a: $(wildcard libavutil/*.[ch])
libavcodec/libavcodec.a: $(wildcard libavcodec/*.[ch] libavcodec/*/*.[chS])
libavformat/libavformat.a: $(wildcard libavformat/*.[ch])
-postproc/libswscale.a: $(wildcard postproc/*.[ch])
+libswscale/libswscale.a: $(wildcard libswscale/*.[ch])
libmpeg2/libmpeg2.a: $(wildcard libmpeg2/*.[ch])
liba52/liba52.a: $(wildcard liba52/*.[ch])
diff --git a/libmpcodecs/vf_halfpack.c b/libmpcodecs/vf_halfpack.c
index 7f8b87a21b..67da7959fd 100644
--- a/libmpcodecs/vf_halfpack.c
+++ b/libmpcodecs/vf_halfpack.c
@@ -13,7 +13,7 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
struct vf_priv_s {
int field;
diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c
index 05b614b1fc..7aadc6ca87 100644
--- a/libmpcodecs/vf_palette.c
+++ b/libmpcodecs/vf_palette.c
@@ -11,7 +11,7 @@
#include "mp_image.h"
#include "vf.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
//===========================================================================//
diff --git a/libmpcodecs/vf_rgb2bgr.c b/libmpcodecs/vf_rgb2bgr.c
index 5b63f55dd0..3bef397eca 100644
--- a/libmpcodecs/vf_rgb2bgr.c
+++ b/libmpcodecs/vf_rgb2bgr.c
@@ -11,7 +11,7 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
//===========================================================================//
diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c
index e1f25228fd..df84cc03e2 100644
--- a/libmpcodecs/vf_sab.c
+++ b/libmpcodecs/vf_sab.c
@@ -33,7 +33,7 @@
#include "mp_image.h"
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
#include "vf_scale.h"
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index 6dd093251a..008603e832 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -12,7 +12,7 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
#include "vf_scale.h"
#include "m_option.h"
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c
index 60231ea3a1..2239eb016d 100644
--- a/libmpcodecs/vf_screenshot.c
+++ b/libmpcodecs/vf_screenshot.c
@@ -22,7 +22,7 @@
#include "vf_scale.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
struct vf_priv_s {
int frameno;
diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c
index b300e8aabe..5de9040367 100644
--- a/libmpcodecs/vf_smartblur.c
+++ b/libmpcodecs/vf_smartblur.c
@@ -33,7 +33,7 @@
#include "mp_image.h"
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
#include "vf_scale.h"
//===========================================================================//
diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c
index 8310a53efc..702b31c8f5 100644
--- a/libmpcodecs/vf_yuy2.c
+++ b/libmpcodecs/vf_yuy2.c
@@ -12,7 +12,7 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
#include "vf_scale.h"
//===========================================================================//
diff --git a/postproc/Makefile b/libswscale/Makefile
index 475bd31381..475bd31381 100644
--- a/postproc/Makefile
+++ b/libswscale/Makefile
diff --git a/postproc/cs_test.c b/libswscale/cs_test.c
index b1963f92f6..b1963f92f6 100644
--- a/postproc/cs_test.c
+++ b/libswscale/cs_test.c
diff --git a/postproc/rgb2rgb.c b/libswscale/rgb2rgb.c
index 049e105292..049e105292 100644
--- a/postproc/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
diff --git a/postproc/rgb2rgb.h b/libswscale/rgb2rgb.h
index e38893deaf..e38893deaf 100644
--- a/postproc/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
diff --git a/postproc/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index 807da6166f..807da6166f 100644
--- a/postproc/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
diff --git a/postproc/swscale-example.c b/libswscale/swscale-example.c
index f8e0ef4e8e..f8e0ef4e8e 100644
--- a/postproc/swscale-example.c
+++ b/libswscale/swscale-example.c
diff --git a/postproc/swscale.c b/libswscale/swscale.c
index 11f774d99a..11f774d99a 100644
--- a/postproc/swscale.c
+++ b/libswscale/swscale.c
diff --git a/postproc/swscale.h b/libswscale/swscale.h
index e589e7dce0..e589e7dce0 100644
--- a/postproc/swscale.h
+++ b/libswscale/swscale.h
diff --git a/postproc/swscale_altivec_template.c b/libswscale/swscale_altivec_template.c
index d4a38201f1..d4a38201f1 100644
--- a/postproc/swscale_altivec_template.c
+++ b/libswscale/swscale_altivec_template.c
diff --git a/postproc/swscale_internal.h b/libswscale/swscale_internal.h
index 5bccd62b6e..5bccd62b6e 100644
--- a/postproc/swscale_internal.h
+++ b/libswscale/swscale_internal.h
diff --git a/postproc/swscale_template.c b/libswscale/swscale_template.c
index 9830e3d39f..9830e3d39f 100644
--- a/postproc/swscale_template.c
+++ b/libswscale/swscale_template.c
diff --git a/postproc/yuv2rgb.c b/libswscale/yuv2rgb.c
index 63e465fb84..63e465fb84 100644
--- a/postproc/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
diff --git a/postproc/yuv2rgb_altivec.c b/libswscale/yuv2rgb_altivec.c
index 9a73b577ac..9a73b577ac 100644
--- a/postproc/yuv2rgb_altivec.c
+++ b/libswscale/yuv2rgb_altivec.c
diff --git a/postproc/yuv2rgb_mlib.c b/libswscale/yuv2rgb_mlib.c
index b19c2a5d18..b19c2a5d18 100644
--- a/postproc/yuv2rgb_mlib.c
+++ b/libswscale/yuv2rgb_mlib.c
diff --git a/postproc/yuv2rgb_template.c b/libswscale/yuv2rgb_template.c
index 2f15931ead..2f15931ead 100644
--- a/postproc/yuv2rgb_template.c
+++ b/libswscale/yuv2rgb_template.c
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 20e564cf7c..a7f9e01ed9 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -1,7 +1,7 @@
#include "fastmemcpy.h"
#include "cpudetect.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
#include "libmpcodecs/vf_scale.h"
#include "mp_msg.h"
#include "help_mp.h"
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 4e23247bdf..3dc0a1ae52 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -27,7 +27,7 @@
#include "video_out.h"
#include "video_out_internal.h"
#include "aspect.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
#include "libmpcodecs/vf_scale.h"
#include "font_load.h"
#include "sub.h"
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index 03f45c0b7e..229446f3d0 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -47,7 +47,7 @@
#endif
#include "mp_msg.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
#include "libmpcodecs/vf_scale.h"
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 173aea86d4..bffd7880b4 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -38,7 +38,7 @@ int XShmGetEventBase(Display *);
#include "fastmemcpy.h"
#include "sub.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
#include "libmpcodecs/vf_scale.h"
#define MODE_RGB 0x1
#define MODE_BGR 0x2
diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c
index 332a072f1d..3a1f2cec72 100644
--- a/libvo/vo_yuv4mpeg.c
+++ b/libvo/vo_yuv4mpeg.c
@@ -39,7 +39,7 @@
#include "sub.h"
#include "fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/swscale.h"
#include "libmpcodecs/vf_scale.h"
static vo_info_t info =
diff --git a/spudec.c b/spudec.c
index 6b10e5ffa0..0b0327e4e5 100644
--- a/spudec.c
+++ b/spudec.c
@@ -23,7 +23,7 @@
#include <math.h>
#include "libvo/video_out.h"
#include "spudec.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
#define MIN(a, b) ((a)<(b)?(a):(b))
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 12:31:37 +0000