diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-05-29 16:03:35 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-05-29 16:03:35 +0100 |
| commit | f5345900a0e36a83841ad06b11aa4bdb22ebb883 (patch) | |
| tree | 2217a11d2bf0d0bafcfbd1f9fc0f0fa1bfd91f29 /src/post | |
| parent | 2c946fa6a9b7b9b3edea5351c1f7021e51b7c177 (diff) | |
| parent | a5dfeeb30093308da4e614e4bc8fd642d01affcc (diff) | |
| download | xine-lib-f5345900a0e36a83841ad06b11aa4bdb22ebb883.tar.gz xine-lib-f5345900a0e36a83841ad06b11aa4bdb22ebb883.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-utils/array.h => include/xine/array.h
rename : src/xine-utils/attributes.h => include/xine/attributes.h
rename : src/xine-engine/audio_out.h => include/xine/audio_out.h
rename : src/xine-engine/broadcaster.h => include/xine/broadcaster.h
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/xine-engine/configfile.h => include/xine/configfile.h
rename : src/xine-utils/list.h => include/xine/list.h
rename : src/xine-engine/metronom.h => include/xine/metronom.h
rename : src/xine-engine/osd.h => include/xine/osd.h
rename : src/xine-utils/pool.h => include/xine/pool.h
rename : src/xine-engine/refcounter.h => include/xine/refcounter.h
rename : src/xine-utils/ring_buffer.h => include/xine/ring_buffer.h
rename : src/xine-engine/scratch.h => include/xine/scratch.h
rename : src/xine-utils/sorted_array.h => include/xine/sorted_array.h
rename : src/xine-engine/video_out.h => include/xine/video_out.h
rename : src/xine-engine/video_overlay.h => include/xine/video_overlay.h
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libspucc/cc_decoder.c => src/spu_dec/cc_decoder.c
Diffstat (limited to 'src/post')
| -rw-r--r-- | src/post/audio/stretch.c | 2 | ||||
| -rw-r--r-- | src/post/planar/unsharp.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 37952cd56..c082eefa6 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -152,7 +152,7 @@ static void stretchscr_exit (scr_plugin_t *scr) { free(this); } -static stretchscr_t* stretchscr_init (double *stretch_factor) { +static stretchscr_t *XINE_MALLOC stretchscr_init (double *stretch_factor) { stretchscr_t *this; this = calloc(1, sizeof(stretchscr_t)); diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c index 91ac6de82..2f8b74496 100644 --- a/src/post/planar/unsharp.c +++ b/src/post/planar/unsharp.c @@ -26,13 +26,6 @@ #include <xine/xineutils.h> #include <pthread.h> -#ifndef MIN -#define MIN(a,b) (((a)<(b))?(a):(b)) -#endif -#ifndef MAX -#define MAX(a,b) (((a)>(b))?(a):(b)) -#endif - /*===========================================================================*/ #define MIN_MATRIX_SIZE 3 |