aacdec: Rename some functions

diff --git a/aacdec.c b/aacdec.c
index 2433b181ef8d7b3730f3e7dd10c1169c55fdc8ce..c20761c6f451c8d0ac93730e0258678c3ea37a7c 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -40,7 +40,7 @@
  *
  * \sa filter, filter_node
  */
  *
  * \sa filter, filter_node
  */

-struct private_mp4dec_data {
+struct private_aacdec_data {

        NeAACDecHandle decoder;
        NeAACDecFrameInfo frame_info;
 
        NeAACDecHandle decoder;
        NeAACDecFrameInfo frame_info;
 


@@ -51,9 +51,9 @@ struct private_mp4dec_data {
        long unsigned entry;
 };
 
        long unsigned entry;
 };
 

-static ssize_t mp4dec(char *input_buffer, size_t len, struct filter_node *fn)
+static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)

 {
 {

-       struct private_mp4dec_data *padd = fn->private_data;
+       struct private_aacdec_data *padd = fn->private_data;

        struct filter_chain_info *fci = fn->fci;
        unsigned long rate = 0;
        unsigned char channels = 0;
        struct filter_chain_info *fci = fn->fci;
        unsigned long rate = 0;
        unsigned char channels = 0;


@@ -148,19 +148,19 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-static void mp4dec_open(struct filter_node *fn)
+static void aacdec_open(struct filter_node *fn)

 {
 {

-       fn->private_data = para_calloc(sizeof(struct private_mp4dec_data));
-       struct private_mp4dec_data *padd = fn->private_data;
+       fn->private_data = para_calloc(sizeof(struct private_aacdec_data));
+       struct private_aacdec_data *padd = fn->private_data;

 
        fn->bufsize = AAC_OUTBUF_SIZE;
        fn->buf = para_calloc(fn->bufsize);
        padd->decoder = aac_open();
 }
 
 
        fn->bufsize = AAC_OUTBUF_SIZE;
        fn->buf = para_calloc(fn->bufsize);
        padd->decoder = aac_open();
 }
 

-static void mp4dec_close(struct filter_node *fn)
+static void aacdec_close(struct filter_node *fn)

 {
 {

-       struct private_mp4dec_data *padd = fn->private_data;
+       struct private_aacdec_data *padd = fn->private_data;

 
        NeAACDecClose(padd->decoder);
        free(fn->buf);
 
        NeAACDecClose(padd->decoder);
        free(fn->buf);


@@ -176,7 +176,7 @@ static void mp4dec_close(struct filter_node *fn)
  */
 void aacdec_init(struct filter *f)
 {
  */
 void aacdec_init(struct filter *f)
 {

-       f->open = mp4dec_open;
-       f->convert = mp4dec;
-       f->close = mp4dec_close;
+       f->open = aacdec_open;
+       f->convert = aacdec;
+       f->close = aacdec_close;

 }
 }