mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
galaktos: -distribute fftsg.h
-get rid of bad merge remnant
This commit is contained in:
parent
36eedf407f
commit
493a666a99
@ -11,7 +11,7 @@ SOURCES_galaktos = plugin.c plugin.h \
|
|||||||
eval.c eval.h \
|
eval.c eval.h \
|
||||||
init_cond.c init_cond.h init_cond_types.h \
|
init_cond.c init_cond.h init_cond_types.h \
|
||||||
PCM.c PCM.h \
|
PCM.c PCM.h \
|
||||||
fftsg.c \
|
fftsg.c fftsg.h \
|
||||||
per_frame_eqn.c per_frame_eqn.h per_frame_eqn_types.h \
|
per_frame_eqn.c per_frame_eqn.h per_frame_eqn_types.h \
|
||||||
splaytree.c splaytree.h splaytree_types.h \
|
splaytree.c splaytree.h splaytree_types.h \
|
||||||
custom_shape.c custom_shape.h custom_shape_types.h \
|
custom_shape.c custom_shape.h custom_shape_types.h \
|
||||||
|
@ -805,11 +805,8 @@ void makect(int nc, int *ip, double *c)
|
|||||||
#define CDFT_4THREADS_BEGIN_N 524288
|
#define CDFT_4THREADS_BEGIN_N 524288
|
||||||
#endif
|
#endif
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
<<<<<<< .working
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
=======
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
>>>>>>> .merge-right.r21326
|
|
||||||
#define cdft_thread_t HANDLE
|
#define cdft_thread_t HANDLE
|
||||||
#define cdft_thread_create(thp,func,argp) { \
|
#define cdft_thread_create(thp,func,argp) { \
|
||||||
DWORD thid; \
|
DWORD thid; \
|
||||||
|
Loading…
Reference in New Issue
Block a user