From: <fla...@gm...> - 2007-04-28 15:46:34
|
# HG changeset patch # User Diego 'Flameeyes' Pettenò <fla...@gm...> # Date 1177775001 -7200 # Node ID a4fe610055c22d92739ee7103df54a2789a2871e # Parent bb36fb32c055ceb0c97acadc763f93ac4d09f4b8 Add missing NULL at the end of every destination array in the conversion matrix (the first entry is from SF_UNKNOWN). diff -r a4fe610055c22d92739ee7103df54a2789a2871e -r bb36fb32c055ceb0c97acadc763f93ac4d09f4b8 src/xine-engine/audio_conversions.c --- a/src/xine-engine/audio_conversions.c Sat Apr 28 17:43:21 2007 +0200 +++ b/src/xine-engine/audio_conversions.c Sat Apr 28 16:56:17 2007 +0200 @@ -128,7 +128,7 @@ const conversion_function conversion_mat const conversion_function conversion_matrix[SF_INVALID][SF_INVALID] = { /* From SF_UNKNOWN: nothing */ { NULL, }, - { /* SF_S8 */ + { NULL, /* SF_S8 */ CVT_NOOP, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -140,7 +140,7 @@ const conversion_function conversion_mat #endif NULL, NULL }, - { /* SF_U8 */ + { NULL, /* SF_U8 */ NULL, CVT_NOOP, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -152,7 +152,7 @@ const conversion_function conversion_mat #endif NULL, NULL }, - { /* SF_S16_LE */ + { NULL, /* SF_S16_LE */ NULL, NULL, CVT_NOOP, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -160,7 +160,7 @@ const conversion_function conversion_mat CVT_DUAL_LE(s16, float32), NULL, NULL }, - { /* SF_S16_BE */ + { NULL, /* SF_S16_BE */ NULL, NULL, NULL, CVT_NOOP, NULL, NULL, NULL, NULL, NULL, NULL, @@ -168,7 +168,7 @@ const conversion_function conversion_mat CVT_DUAL_BE(s16, float32), NULL, NULL }, - { /* SF_U16_LE */ + { NULL, /* SF_U16_LE */ NULL, NULL, NULL, NULL, CVT_NOOP, NULL, NULL, NULL, NULL, NULL, @@ -176,7 +176,7 @@ const conversion_function conversion_mat CVT_DUAL_LE(u16, float32), NULL, NULL }, - { /* SF_U16_BE */ + { NULL, /* SF_U16_BE */ NULL, NULL, NULL, NULL, NULL, CVT_NOOP, NULL, NULL, NULL, NULL, @@ -184,7 +184,7 @@ const conversion_function conversion_mat CVT_DUAL_BE(u16, float32), NULL, NULL }, - { /* SF_S24_LE */ + { NULL, /* SF_S24_LE */ NULL, NULL, NULL, NULL, NULL, NULL, CVT_NOOP, NULL, NULL, NULL, @@ -193,7 +193,7 @@ const conversion_function conversion_mat NULL, NULL, NULL, NULL }, - { /* SF_S24_BE */ + { NULL, /* SF_S24_BE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, CVT_NOOP, NULL, NULL, @@ -202,7 +202,7 @@ const conversion_function conversion_mat NULL, NULL, NULL, NULL }, - { /* SF_U24_LE */ + { NULL, /* SF_U24_LE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, CVT_NOOP, NULL, @@ -210,7 +210,7 @@ const conversion_function conversion_mat /*CVT_DUAL_LE(u24, float32),*/ NULL, NULL }, - { /* SF_U24_BE */ + { NULL, /* SF_U24_BE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, CVT_NOOP, @@ -218,7 +218,7 @@ const conversion_function conversion_mat /*CVT_DUAL_BE(u24, float32),*/ NULL, NULL }, - { /* SF_S32_LE */ + { NULL, /* SF_S32_LE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -226,7 +226,7 @@ const conversion_function conversion_mat CVT_DUAL_LE(s32, float32), NULL, NULL }, - { /* SF_S32_BE */ + { NULL, /* SF_S32_BE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -234,7 +234,7 @@ const conversion_function conversion_mat CVT_DUAL_BE(s32, float32), NULL, NULL }, - { /* SF_U32_LE */ + { NULL, /* SF_U32_LE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -242,7 +242,7 @@ const conversion_function conversion_mat CVT_DUAL_LE(u32, float32), NULL, NULL }, - { /* SF_U32_BE */ + { NULL, /* SF_U32_BE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -250,7 +250,7 @@ const conversion_function conversion_mat CVT_DUAL_BE(u32, float32), NULL, NULL }, - { /* SF_FLOAT_LE */ + { NULL, /* SF_FLOAT_LE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -258,15 +258,15 @@ const conversion_function conversion_mat CVT_NOOP, NULL, NULL, NULL }, - { /* SF_FLOAT_BE */ - NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, - NULL, CVT_NOOP, - NULL, NULL - }, - { /* SF_FLOAT64_LE */ + { NULL, /* SF_FLOAT_BE */ + NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, CVT_NOOP, + NULL, NULL + }, + { NULL, /* SF_FLOAT64_LE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -274,7 +274,7 @@ const conversion_function conversion_mat NULL, NULL, CVT_NOOP, NULL }, - { /* SF_FLOAT64_BE */ + { NULL, /* SF_FLOAT64_BE */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |