Revision 679c2294

View differences:

libavcodec/aac_ac3_parser.c
23 23
#include "parser.h"
24 24
#include "aac_ac3_parser.h"
25 25

  
26
int ac3_parse(AVCodecParserContext *s1,
26
int ff_aac_ac3_parse(AVCodecParserContext *s1,
27 27
                     AVCodecContext *avctx,
28 28
                     const uint8_t **poutbuf, int *poutbuf_size,
29 29
                     const uint8_t *buf, int buf_size)
30 30
{
31
    AC3ParseContext *s = s1->priv_data;
31
    AACAC3ParseContext *s = s1->priv_data;
32 32
    const uint8_t *buf_ptr;
33 33
    int len, sample_rate, bit_rate, channels, samples;
34 34

  
libavcodec/aac_ac3_parser.h
23 23
#ifndef AAC_AC3_PARSER_H
24 24
#define AAC_AC3_PARSER_H
25 25

  
26
typedef struct AC3ParseContext {
26
typedef struct AACAC3ParseContext {
27 27
    uint8_t *inbuf_ptr;
28 28
    int frame_size;
29 29
    int header_size;
30 30
    int (*sync)(const uint8_t *buf, int *channels, int *sample_rate,
31 31
                int *bit_rate, int *samples);
32 32
    uint8_t inbuf[8192]; /* input buffer */
33
} AC3ParseContext;
33
} AACAC3ParseContext;
34 34

  
35
int ac3_parse(AVCodecParserContext *s1,
35
int ff_aac_ac3_parse(AVCodecParserContext *s1,
36 36
                     AVCodecContext *avctx,
37 37
                     const uint8_t **poutbuf, int *poutbuf_size,
38 38
                     const uint8_t *buf, int buf_size);
libavcodec/aac_parser.c
80 80

  
81 81
static int aac_parse_init(AVCodecParserContext *s1)
82 82
{
83
    AC3ParseContext *s = s1->priv_data;
83
    AACAC3ParseContext *s = s1->priv_data;
84 84
    s->inbuf_ptr = s->inbuf;
85 85
    s->header_size = AAC_HEADER_SIZE;
86 86
    s->sync = aac_sync;
......
90 90

  
91 91
AVCodecParser aac_parser = {
92 92
    { CODEC_ID_AAC },
93
    sizeof(AC3ParseContext),
93
    sizeof(AACAC3ParseContext),
94 94
    aac_parse_init,
95
    ac3_parse,
95
    ff_aac_ac3_parse,
96 96
    NULL,
97 97
};
libavcodec/ac3_parser.c
145 145

  
146 146
static int ac3_parse_init(AVCodecParserContext *s1)
147 147
{
148
    AC3ParseContext *s = s1->priv_data;
148
    AACAC3ParseContext *s = s1->priv_data;
149 149
    s->inbuf_ptr = s->inbuf;
150 150
    s->header_size = AC3_HEADER_SIZE;
151 151
    s->sync = ac3_sync;
......
155 155

  
156 156
AVCodecParser ac3_parser = {
157 157
    { CODEC_ID_AC3 },
158
    sizeof(AC3ParseContext),
158
    sizeof(AACAC3ParseContext),
159 159
    ac3_parse_init,
160
    ac3_parse,
160
    ff_aac_ac3_parse,
161 161
    NULL,
162 162
};

Also available in: Unified diff