diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/input_dvb.c | 6 | ||||
| -rw-r--r-- | src/libfaad/diff_to_faad2_cvs.patch | 18 | ||||
| -rw-r--r-- | src/libfaad/sbr_dec.c | 4 |
3 files changed, 24 insertions, 4 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 22d012c97..9a5b05198 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -1163,8 +1163,8 @@ static int channel_index(dvb_input_plugin_t* this, unsigned int service_id) { static int compare_epg_by_starttime(const void* a, const void* b) { const epg_entry_t **epg_a, **epg_b; - epg_a = (const struct epg_entry_t**)a; - epg_b = (const struct epg_entry_t**)b; + epg_a = (const epg_entry_t**)a; + epg_b = (const epg_entry_t**)b; if ((*epg_a)->starttime < (*epg_b)->starttime) { return -1; @@ -1469,6 +1469,7 @@ static void render_text_area(osd_renderer_t* renderer, osd_object_t* osd, char* } } +#if 0 /* unused */ /* For debugging. Prints time in human readable form to log. */ static void print_time(time_t time_to_print) { struct tm* timetime; @@ -1477,6 +1478,7 @@ static void print_time(time_t time_to_print) { printf("%d:%d\n", timetime->tm_hour, timetime->tm_min); } +#endif /* Finds the EPG of the ith next program. 0 means the current program, 1 next. If not found, returns NULL. All these functions expect the EPG entries diff --git a/src/libfaad/diff_to_faad2_cvs.patch b/src/libfaad/diff_to_faad2_cvs.patch index b9772f941..4b5e81e3d 100644 --- a/src/libfaad/diff_to_faad2_cvs.patch +++ b/src/libfaad/diff_to_faad2_cvs.patch @@ -103,3 +103,21 @@ diff -urw /home/thibaut/faad2/libfaad/bits.h ./bits.h #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) #else #define BSWAP(a) \ +--- sbr_dec.c 3 Dec 2004 01:15:30 -0000 ++++ sbr_dec.c 15 Dec 2004 20:55:20 -0000 +@@ -389,6 +389,7 @@ + return 0; + } + ++#if (defined(PS_DEC) || defined(DRM_PS)) + static void ps_dummy_function(qmf_t X_mono[MAX_NTSR][64], + qmf_t X_left[MAX_NTSR][64], qmf_t X_right[MAX_NTSR][64]) + { +@@ -408,7 +409,6 @@ + } + } + +-#if (defined(PS_DEC) || defined(DRM_PS)) + uint8_t sbrDecodeSingleFramePS(sbr_info *sbr, real_t *left_channel, real_t *right_channel, + const uint8_t just_seeked, const uint8_t upsample_only) + { diff --git a/src/libfaad/sbr_dec.c b/src/libfaad/sbr_dec.c index 1307af4f9..c49b57e21 100644 --- a/src/libfaad/sbr_dec.c +++ b/src/libfaad/sbr_dec.c @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: sbr_dec.c,v 1.6 2004/12/03 01:15:30 tmattern Exp $ +** $Id: sbr_dec.c,v 1.7 2004/12/15 20:57:28 mroi Exp $ **/ @@ -389,6 +389,7 @@ uint8_t sbrDecodeSingleFrame(sbr_info *sbr, real_t *channel, return 0; } +#if (defined(PS_DEC) || defined(DRM_PS)) static void ps_dummy_function(qmf_t X_mono[MAX_NTSR][64], qmf_t X_left[MAX_NTSR][64], qmf_t X_right[MAX_NTSR][64]) { @@ -408,7 +409,6 @@ static void ps_dummy_function(qmf_t X_mono[MAX_NTSR][64], } } -#if (defined(PS_DEC) || defined(DRM_PS)) uint8_t sbrDecodeSingleFramePS(sbr_info *sbr, real_t *left_channel, real_t *right_channel, const uint8_t just_seeked, const uint8_t upsample_only) { |