[MPlayer-cvslog] r22764 - in trunk/libaf: af_center.c af_channels.c af_comp.c af_delay.c af_dummy.c af_equalizer.c af_extrastereo.c af_format.c af_gate.c af_hrtf.c af_karaoke.c af_ladspa.c af_lavcresample.c af_pan.c af_resample.c af_sinesuppress.c af_sub.c af_surround.c af_sweep.c af_volnorm.c af_volume.c
diego
subversion at mplayerhq.hu
Tue Mar 20 10:46:01 CET 2007
Author: diego
Date: Tue Mar 20 10:46:00 2007
New Revision: 22764
Modified:
trunk/libaf/af_center.c
trunk/libaf/af_channels.c
trunk/libaf/af_comp.c
trunk/libaf/af_delay.c
trunk/libaf/af_dummy.c
trunk/libaf/af_equalizer.c
trunk/libaf/af_extrastereo.c
trunk/libaf/af_format.c
trunk/libaf/af_gate.c
trunk/libaf/af_hrtf.c
trunk/libaf/af_karaoke.c
trunk/libaf/af_ladspa.c
trunk/libaf/af_lavcresample.c
trunk/libaf/af_pan.c
trunk/libaf/af_resample.c
trunk/libaf/af_sinesuppress.c
trunk/libaf/af_sub.c
trunk/libaf/af_surround.c
trunk/libaf/af_sweep.c
trunk/libaf/af_volnorm.c
trunk/libaf/af_volume.c
Log:
Rename open to af_open so as not to conflict with a previous header definition.
Modified: trunk/libaf/af_center.c
==============================================================================
--- trunk/libaf/af_center.c (original)
+++ trunk/libaf/af_center.c Tue Mar 20 10:46:00 2007
@@ -90,7 +90,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af_center_t* s;
af->control=control;
af->uninit=uninit;
@@ -113,5 +113,5 @@ af_info_t af_info_center = {
"Alex Beregszaszi",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_channels.c
==============================================================================
--- trunk/libaf/af_channels.c (original)
+++ trunk/libaf/af_channels.c Tue Mar 20 10:46:00 2007
@@ -268,7 +268,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -288,5 +288,5 @@ af_info_t af_info_channels = {
"Anders",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_comp.c
==============================================================================
--- trunk/libaf/af_comp.c (original)
+++ trunk/libaf/af_comp.c Tue Mar 20 10:46:00 2007
@@ -138,7 +138,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -158,5 +158,5 @@ af_info_t af_info_comp = {
"Anders",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_delay.c
==============================================================================
--- trunk/libaf/af_delay.c (original)
+++ trunk/libaf/af_delay.c Tue Mar 20 10:46:00 2007
@@ -163,7 +163,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -183,7 +183,7 @@ af_info_t af_info_delay = {
"Anders",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_dummy.c
==============================================================================
--- trunk/libaf/af_dummy.c (original)
+++ trunk/libaf/af_dummy.c Tue Mar 20 10:46:00 2007
@@ -36,7 +36,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -55,5 +55,5 @@ af_info_t af_info_dummy = {
"Anders",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_equalizer.c
==============================================================================
--- trunk/libaf/af_equalizer.c (original)
+++ trunk/libaf/af_equalizer.c Tue Mar 20 10:46:00 2007
@@ -219,7 +219,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -239,7 +239,7 @@ af_info_t af_info_equalizer = {
"Anders",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_extrastereo.c
==============================================================================
--- trunk/libaf/af_extrastereo.c (original)
+++ trunk/libaf/af_extrastereo.c Tue Mar 20 10:46:00 2007
@@ -125,7 +125,7 @@ static af_data_t* play_float(struct af_i
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play_s16;
@@ -147,5 +147,5 @@ af_info_t af_info_extrastereo = {
"Alex Beregszaszi & Pierre Lombard",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_format.c
==============================================================================
--- trunk/libaf/af_format.c (original)
+++ trunk/libaf/af_format.c Tue Mar 20 10:46:00 2007
@@ -306,7 +306,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -325,7 +325,7 @@ af_info_t af_info_format = {
"Anders",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
static inline uint32_t load24bit(void* data, int pos) {
Modified: trunk/libaf/af_gate.c
==============================================================================
--- trunk/libaf/af_gate.c (original)
+++ trunk/libaf/af_gate.c Tue Mar 20 10:46:00 2007
@@ -134,7 +134,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -154,5 +154,5 @@ af_info_t af_info_gate = {
"Anders",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_hrtf.c
==============================================================================
--- trunk/libaf/af_hrtf.c (original)
+++ trunk/libaf/af_hrtf.c Tue Mar 20 10:46:00 2007
@@ -589,7 +589,7 @@ static int allocate(af_hrtf_t *s)
}
/* Allocate memory and set function pointers */
-static int open(af_instance_t* af)
+static int af_open(af_instance_t* af)
{
int i;
af_hrtf_t *s;
@@ -663,5 +663,5 @@ af_info_t af_info_hrtf = {
"ylai",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_karaoke.c
==============================================================================
--- trunk/libaf/af_karaoke.c (original)
+++ trunk/libaf/af_karaoke.c Tue Mar 20 10:46:00 2007
@@ -61,7 +61,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control = control;
af->uninit = uninit;
af->play = play;
@@ -82,5 +82,5 @@ af_info_t af_info_karaoke = {
"Reynaldo H. Verdejo Pinochet",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_ladspa.c
==============================================================================
--- trunk/libaf/af_ladspa.c (original)
+++ trunk/libaf/af_ladspa.c Tue Mar 20 10:46:00 2007
@@ -131,7 +131,7 @@ typedef struct af_ladspa_s
/* ------------------------------------------------------------------------- */
-static int open(af_instance_t *af);
+static int af_open(af_instance_t *af);
static int af_ladspa_malloc_failed(char*);
/* ------------------------------------------------------------------------- */
@@ -144,7 +144,7 @@ af_info_t af_info_ladspa = {
"Ivo van Poorten",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
/* ------------------------------------------------------------------------- */
@@ -936,7 +936,7 @@ static af_data_t* play(struct af_instanc
* \return Either AF_ERROR or AF_OK
*/
-static int open(af_instance_t *af) {
+static int af_open(af_instance_t *af) {
af->control=control;
af->uninit=uninit;
Modified: trunk/libaf/af_lavcresample.c
==============================================================================
--- trunk/libaf/af_lavcresample.c (original)
+++ trunk/libaf/af_lavcresample.c Tue Mar 20 10:46:00 2007
@@ -164,7 +164,7 @@ static af_data_t* play(struct af_instanc
return data;
}
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af_resample_t *s = calloc(1,sizeof(af_resample_t));
af->control=control;
af->uninit=uninit;
@@ -186,5 +186,5 @@ af_info_t af_info_lavcresample = {
"Michael Niedermayer",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_pan.c
==============================================================================
--- trunk/libaf/af_pan.c (original)
+++ trunk/libaf/af_pan.c Tue Mar 20 10:46:00 2007
@@ -164,7 +164,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -185,5 +185,5 @@ af_info_t af_info_pan = {
"Anders",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_resample.c
==============================================================================
--- trunk/libaf/af_resample.c (original)
+++ trunk/libaf/af_resample.c Tue Mar 20 10:46:00 2007
@@ -356,7 +356,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -377,6 +377,6 @@ af_info_t af_info_resample = {
"Anders",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_sinesuppress.c
==============================================================================
--- trunk/libaf/af_sinesuppress.c (original)
+++ trunk/libaf/af_sinesuppress.c Tue Mar 20 10:46:00 2007
@@ -150,7 +150,7 @@ static af_data_t* play_float(struct af_i
#endif
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play_s16;
@@ -173,5 +173,5 @@ af_info_t af_info_sinesuppress = {
"Michael Niedermayer",
"",
0,
- open
+ af_open
};
Modified: trunk/libaf/af_sub.c
==============================================================================
--- trunk/libaf/af_sub.c (original)
+++ trunk/libaf/af_sub.c Tue Mar 20 10:46:00 2007
@@ -153,7 +153,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af_sub_t* s;
af->control=control;
af->uninit=uninit;
@@ -177,5 +177,5 @@ af_info_t af_info_sub = {
"Anders",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_surround.c
==============================================================================
--- trunk/libaf/af_surround.c (original)
+++ trunk/libaf/af_surround.c Tue Mar 20 10:46:00 2007
@@ -250,7 +250,7 @@ static af_data_t* play(struct af_instanc
return data;
}
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -271,5 +271,5 @@ af_info_t af_info_surround =
"Steve Davies <steve at daviesfam.org>",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_sweep.c
==============================================================================
--- trunk/libaf/af_sweep.c (original)
+++ trunk/libaf/af_sweep.c Tue Mar 20 10:46:00 2007
@@ -70,7 +70,7 @@ static af_data_t* play(struct af_instanc
return data;
}
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
af->control=control;
af->uninit=uninit;
af->play=play;
@@ -87,6 +87,6 @@ af_info_t af_info_sweep = {
"Michael Niedermayer",
"",
AF_FLAGS_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_volnorm.c
==============================================================================
--- trunk/libaf/af_volnorm.c (original)
+++ trunk/libaf/af_volnorm.c Tue Mar 20 10:46:00 2007
@@ -311,7 +311,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
int i = 0;
af->control=control;
af->uninit=uninit;
@@ -343,5 +343,5 @@ af_info_t af_info_volnorm = {
"Alex Beregszaszi & Pierre Lombard",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
Modified: trunk/libaf/af_volume.c
==============================================================================
--- trunk/libaf/af_volume.c (original)
+++ trunk/libaf/af_volume.c Tue Mar 20 10:46:00 2007
@@ -191,7 +191,7 @@ static af_data_t* play(struct af_instanc
}
// Allocate memory and set function pointers
-static int open(af_instance_t* af){
+static int af_open(af_instance_t* af){
int i = 0;
af->control=control;
af->uninit=uninit;
@@ -217,5 +217,5 @@ af_info_t af_info_volume = {
"Anders",
"",
AF_FLAGS_NOT_REENTRANT,
- open
+ af_open
};
More information about the MPlayer-cvslog
mailing list