diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2001-09-06 18:38:11 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2001-09-06 18:38:11 +0000 |
| commit | 94f33ff7e3b7140e78c014be1a68fe9c1ba17814 (patch) | |
| tree | 56aacd13a3a2f5de4def305cceb2789cfa9bd807 /src/libspudec | |
| parent | 8d3fda905911b0b1cdadb33c00fb1f800e8f9320 (diff) | |
| download | xine-lib-94f33ff7e3b7140e78c014be1a68fe9c1ba17814.tar.gz xine-lib-94f33ff7e3b7140e78c014be1a68fe9c1ba17814.tar.bz2 | |
Trying to port the xine-lib sources to a non-gcc compiler
CVS patchset: 584
CVS date: 2001/09/06 18:38:11
Diffstat (limited to 'src/libspudec')
| -rw-r--r-- | src/libspudec/spu.c | 23 | ||||
| -rw-r--r-- | src/libspudec/xine_decoder.c | 42 |
2 files changed, 42 insertions, 23 deletions
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c index e0f0a4aec..b52429a4f 100644 --- a/src/libspudec/spu.c +++ b/src/libspudec/spu.c @@ -19,7 +19,7 @@ * along with this program; see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. * -* $Id: spu.c,v 1.10 2001/08/17 15:54:31 ehasenle Exp $ +* $Id: spu.c,v 1.11 2001/09/06 18:38:12 jkeil Exp $ * *****/ @@ -72,10 +72,23 @@ #define LOG_DEBUG 1 #ifdef DEBUG -#define LOG(lvl, fmt...) fprintf (stderr, fmt); -#else -#define LOG(lvl, fmt...) -#endif + +# ifdef __GNUC__ +# define LOG(lvl, fmt...) fprintf (stderr, fmt); +# else +# define LOG(lvl, ...) fprintf (stderr, __VA_ARGS__); +# endif + +#else /* !DEBUG */ + +# ifdef __GNUC_ +# define LOG(lvl, fmt...) +# else +# define LOG(lvl, ...) +# endif + +#endif /* !DEBUG */ + /* Return value: reassembly complete = 1 */ int spuReassembly (spu_seq_t *seq, int start, uint8_t *pkt_data, u_int pkt_len) diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index b2dc7b793..e5f6f9232 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.11 2001/08/17 13:34:25 heikos Exp $ + * $Id: xine_decoder.c,v 1.12 2001/09/06 18:38:12 jkeil Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -43,24 +43,30 @@ #include "video_out/alphablend.h" #include "xine-engine/bswap.h" +#ifdef __GNUC__ +#define CLUT_Y_CR_CB_INIT(_y,_cr,_cb) {y: (_y), cr: (_cr), cb: (_cb)} +#else +#define CLUT_Y_CR_CB_INIT(_y,_cr,_cb) { (_cb), (_cr), (_y) } +#endif + static clut_t __default_clut[] = { - {y: 0x00, cr: 0x80, cb:0x80}, - {y: 0xbf, cr: 0x80, cb:0x80}, - {y: 0x10, cr: 0x80, cb:0x80}, - {y: 0x28, cr: 0x6d, cb:0xef}, - {y: 0x51, cr: 0xef, cb:0x5a}, - {y: 0xbf, cr: 0x80, cb:0x80}, - {y: 0x36, cr: 0x80, cb:0x80}, - {y: 0x28, cr: 0x6d, cb:0xef}, - {y: 0xbf, cr: 0x80, cb:0x80}, - {y: 0x51, cr: 0x80, cb:0x80}, - {y: 0xbf, cr: 0x80, cb:0x80}, - {y: 0x10, cr: 0x80, cb:0x80}, - {y: 0x28, cr: 0x6d, cb:0xef}, - {y: 0x5c, cr: 0x80, cb:0x80}, - {y: 0xbf, cr: 0x80, cb:0x80}, - {y: 0x1c, cr: 0x80, cb:0x80}, - {y: 0x28, cr: 0x6d, cb:0xef} + CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0xbf, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x10, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x28, 0x6d, 0xef), + CLUT_Y_CR_CB_INIT(0x51, 0xef, 0x5a), + CLUT_Y_CR_CB_INIT(0xbf, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x36, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x28, 0x6d, 0xef), + CLUT_Y_CR_CB_INIT(0xbf, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x51, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0xbf, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x10, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x28, 0x6d, 0xef), + CLUT_Y_CR_CB_INIT(0x5c, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0xbf, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x1c, 0x80, 0x80), + CLUT_Y_CR_CB_INIT(0x28, 0x6d, 0xef) }; #define NUM_SEQ_BUFFERS 5 |