[patch] Renames function, removes macro.

1.16-av_freep.patch (text/plain), 3.63 KB, created by Maurice van der Pot (RETIRED) on 2005-02-15 09:27:35 UTC

diff -ruN vice-1.16/src/arch/unix/ffmpeglib.c vice-1.16-patched/src/arch/unix/ffmpeglib.c
--- vice-1.16/src/arch/unix/ffmpeglib.c	2003-12-20 21:55:03.000000000 +0100
+++ vice-1.16-patched/src/arch/unix/ffmpeglib.c	2005-02-15 18:08:41.241607072 +0100
@@ -49,7 +49,7 @@
     GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_fill);
     GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_get_size);
     GET_PROC_ADDRESS_AND_TEST_AVCODEC(img_convert);
-    GET_PROC_ADDRESS_AND_TEST_AVCODEC(__av_freep);
+    GET_PROC_ADDRESS_AND_TEST_AVCODEC(av_freep);
 
     GET_PROC_ADDRESS_AND_TEST_AVFORMAT(av_register_all);
     GET_PROC_ADDRESS_AND_TEST_AVFORMAT(av_new_stream);
diff -ruN vice-1.16/src/arch/win32/ffmpeglib.c vice-1.16-patched/src/arch/win32/ffmpeglib.c
--- vice-1.16/src/arch/win32/ffmpeglib.c	2003-12-20 21:55:03.000000000 +0100
+++ vice-1.16-patched/src/arch/win32/ffmpeglib.c	2005-02-15 18:09:04.614053920 +0100
@@ -54,7 +54,7 @@
     lib->p_avpicture_fill = NULL;
     lib->p_avpicture_get_size = NULL;
     lib->p_img_convert = NULL;
-    lib->p___av_freep = NULL;
+    lib->p_av_freep = NULL;
 
     if (avformat_dll) {
         if (!FreeLibrary(avformat_dll)) {
@@ -113,7 +113,7 @@
         GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_fill);
         GET_PROC_ADDRESS_AND_TEST_AVCODEC(avpicture_get_size);
         GET_PROC_ADDRESS_AND_TEST_AVCODEC(img_convert);
-        GET_PROC_ADDRESS_AND_TEST_AVCODEC(__av_freep);
+        GET_PROC_ADDRESS_AND_TEST_AVCODEC(av_freep);
     }
 
     if (!avformat_dll) {
diff -ruN vice-1.16/src/gfxoutputdrv/ffmpeg/avcodec.h vice-1.16-patched/src/gfxoutputdrv/ffmpeg/avcodec.h
--- vice-1.16/src/gfxoutputdrv/ffmpeg/avcodec.h	2003-11-01 16:22:20.000000000 +0100
+++ vice-1.16-patched/src/gfxoutputdrv/ffmpeg/avcodec.h	2005-02-15 18:09:31.320993848 +0100
@@ -1672,8 +1672,7 @@
 void *av_realloc(void *ptr, unsigned int size);
 void av_free(void *ptr);
 char *av_strdup(const char *s);
-void __av_freep(void **ptr);
-#define av_freep(p) __av_freep((void **)(p))
+void av_freep(void **ptr);
 void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size);
 /* for static data only */
 /* call av_free_static to release all staticaly allocated tables */
diff -ruN vice-1.16/src/gfxoutputdrv/ffmpegdrv.c vice-1.16-patched/src/gfxoutputdrv/ffmpegdrv.c
--- vice-1.16/src/gfxoutputdrv/ffmpegdrv.c	2004-01-16 19:44:47.000000000 +0100
+++ vice-1.16-patched/src/gfxoutputdrv/ffmpegdrv.c	2005-02-15 18:09:49.378248728 +0100
@@ -553,7 +553,7 @@
     
     /* free the streams */
     for(i = 0; i < ffmpegdrv_oc->nb_streams; i++) {
-        (*ffmpeglib.p___av_freep)((void**)&ffmpegdrv_oc->streams[i]);
+        (*ffmpeglib.p_av_freep)((void**)&ffmpegdrv_oc->streams[i]);
     }
 
 
diff -ruN vice-1.16/src/gfxoutputdrv/ffmpeglib.h vice-1.16-patched/src/gfxoutputdrv/ffmpeglib.h
--- vice-1.16/src/gfxoutputdrv/ffmpeglib.h	2003-12-20 21:55:06.000000000 +0100
+++ vice-1.16-patched/src/gfxoutputdrv/ffmpeglib.h	2005-02-15 18:10:07.563484152 +0100
@@ -48,7 +48,7 @@
 typedef int (*avpicture_fill_t) (AVPicture*, uint8_t*, int, int, int);
 typedef int (*avpicture_get_size_t) (int, int, int);
 typedef int (*img_convert_t) (AVPicture*, int, AVPicture*, int, int, int);
-typedef void (*__av_freep_t) (void**);
+typedef void (*av_freep_t) (void**);
 
 /* avformat fucntions */
 typedef void (*av_register_all_t) (void);
@@ -71,7 +71,7 @@
     avpicture_fill_t            p_avpicture_fill;
     avpicture_get_size_t        p_avpicture_get_size;
     img_convert_t               p_img_convert;
-    __av_freep_t                p___av_freep;
+    av_freep_t                  p_av_freep;
 
     av_register_all_t           p_av_register_all;
     av_new_stream_t             p_av_new_stream;