changeset 466:68765cfbe876 trunk

[svn] Clean up after myself, reverting botched fix to ffmpeg code.
author chainsaw
date Wed, 18 Jan 2006 12:35:20 -0800
parents 986ac3a23cb7
children bd423985b2cf
files Plugins/Input/wma/libffwma/futils.c Plugins/Input/wma/wma.c
diffstat 2 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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; 
--- 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;