# HG changeset patch # User chainsaw # Date 1137616520 28800 # Node ID 68765cfbe87695e67c3f2ff184e40872c081fbda # Parent 986ac3a23cb7c7323c5c3e1636f38221b4455c19 [svn] Clean up after myself, reverting botched fix to ffmpeg code. diff -r 986ac3a23cb7 -r 68765cfbe876 Plugins/Input/wma/libffwma/futils.c --- a/Plugins/Input/wma/libffwma/futils.c Wed Jan 18 11:21:11 2006 -0800 +++ b/Plugins/Input/wma/libffwma/futils.c Wed Jan 18 12:35:20 2006 -0800 @@ -149,7 +149,7 @@ void *data = malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); if (!data) return AVERROR_NOMEM; - memset((int *)data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); + memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); av_init_packet(pkt); pkt->data = data; diff -r 986ac3a23cb7 -r 68765cfbe876 Plugins/Input/wma/wma.c --- a/Plugins/Input/wma/wma.c Wed Jan 18 11:21:11 2006 -0800 +++ b/Plugins/Input/wma/wma.c Wed Jan 18 12:35:20 2006 -0800 @@ -78,7 +78,6 @@ static int wma_get_time(void); static void wma_get_song_info(char *filename, char **title, int *length); static void wma_file_info_box(char *filename); -static void wma_set_eq(int q_on, float q_preamp, float *q_bands); static char *wsong_title; static int wsong_time; @@ -220,13 +219,6 @@ return ext; } -static char *slashkill(gchar *fullname) -{ - gchar *splitname = strrchr(fullname, '/'); - if(splitname != NULL) ++splitname; - return splitname; -} - static char* w_getstr(char* str) { if(str && strlen(str) > 0) return str;