Mercurial > mplayer.hg
changeset 15258:c2979462805a
fixed wrong function pointers definitions
| author | nicodvb |
|---|---|
| date | Mon, 25 Apr 2005 06:46:30 +0000 |
| parents | 10f348a08fd1 |
| children | 854990f357ee |
| files | libmpcodecs/ae.h libmpcodecs/ae_pcm.c |
| diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ae.h Sun Apr 24 22:27:56 2005 +0000 +++ b/libmpcodecs/ae.h Mon Apr 25 06:46:30 2005 +0000 @@ -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);
--- a/libmpcodecs/ae_pcm.c Sun Apr 24 22:27:56 2005 +0000 +++ b/libmpcodecs/ae_pcm.c Mon Apr 25 06:46:30 2005 +0000 @@ -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)