[MPlayer-cvslog] CVS: main/libmpcodecs ae.h, 1.1, 1.2 ae_pcm.c, 1.3, 1.4

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv5772

Modified Files:
	ae.h ae_pcm.c 
Log Message:
fixed wrong function pointers definitions

Index: ae.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ae.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ae.h	22 Apr 2005 06:59:08 -0000	1.1
+++ ae.h	25 Apr 2005 06:46:30 -0000	1.2
@@ -8,6 +8,7 @@
 #define ACODEC_NULL 3
 #define ACODEC_LAVC 4
 #define ACODEC_TOOLAME 5
+#define ACODEC_FAAC 6
 
 #define AE_NEEDS_COMPRESSED_INPUT 1
 
@@ -19,7 +20,7 @@
 	int audio_preload;
 } audio_encoding_params_t;
 
-typedef struct {
+typedef struct audio_encoder_s {
 	int codec;
 	int flags;
 	muxer_stream_t *stream;
@@ -31,12 +32,12 @@
 	int decode_buffer_size;
 	int decode_buffer_len;
 	void *priv;
-	int (*bind)(void*, muxer_stream_t*);
-	int (*get_frame_size)(void*);
-	int (*set_decoded_len)(void *encoder, int len);
-	int (*encode)(void *encoder, uint8_t *dest, void *src, int nsamples, int max_size);
-	int (*fixup)();
-	int (*close)();
+	int (*bind)(struct audio_encoder_s*, muxer_stream_t*);
+	int (*get_frame_size)(struct audio_encoder_s*);
+	int (*set_decoded_len)(struct audio_encoder_s *encoder, int len);
+	int (*encode)(struct audio_encoder_s *encoder, uint8_t *dest, void *src, int nsamples, int max_size);
+	void (*fixup)(struct audio_encoder_s *encoder);
+	int (*close)(struct audio_encoder_s *encoder);
 } audio_encoder_t;
 
 audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params);

Index: ae_pcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ae_pcm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ae_pcm.c	22 Apr 2005 17:53:31 -0000	1.3
+++ ae_pcm.c	25 Apr 2005 06:46:30 -0000	1.4
@@ -41,9 +41,9 @@
 	return max_size;
 }
 
-static void set_decoded_len(audio_encoder_t *encoder, int len)
+static int set_decoded_len(audio_encoder_t *encoder, int len)
 {
-	return;
+	return len;
 }
 
 static int close_pcm(audio_encoder_t *encoder)