Commit 679c2294 authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

cosmetics: rename for consistency after previous aac and ac3 parsers move

Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 99ff31dc
......@@ -23,12 +23,12 @@
#include "parser.h"
#include "aac_ac3_parser.h"
int ac3_parse(AVCodecParserContext *s1,
int ff_aac_ac3_parse(AVCodecParserContext *s1,
AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size)
{
AC3ParseContext *s = s1->priv_data;
AACAC3ParseContext *s = s1->priv_data;
const uint8_t *buf_ptr;
int len, sample_rate, bit_rate, channels, samples;
......
......@@ -23,16 +23,16 @@
#ifndef AAC_AC3_PARSER_H
#define AAC_AC3_PARSER_H
typedef struct AC3ParseContext {
typedef struct AACAC3ParseContext {
uint8_t *inbuf_ptr;
int frame_size;
int header_size;
int (*sync)(const uint8_t *buf, int *channels, int *sample_rate,
int *bit_rate, int *samples);
uint8_t inbuf[8192]; /* input buffer */
} AC3ParseContext;
} AACAC3ParseContext;
int ac3_parse(AVCodecParserContext *s1,
int ff_aac_ac3_parse(AVCodecParserContext *s1,
AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size);
......
......@@ -80,7 +80,7 @@ static int aac_sync(const uint8_t *buf, int *channels, int *sample_rate,
static int aac_parse_init(AVCodecParserContext *s1)
{
AC3ParseContext *s = s1->priv_data;
AACAC3ParseContext *s = s1->priv_data;
s->inbuf_ptr = s->inbuf;
s->header_size = AAC_HEADER_SIZE;
s->sync = aac_sync;
......@@ -90,8 +90,8 @@ static int aac_parse_init(AVCodecParserContext *s1)
AVCodecParser aac_parser = {
{ CODEC_ID_AAC },
sizeof(AC3ParseContext),
sizeof(AACAC3ParseContext),
aac_parse_init,
ac3_parse,
ff_aac_ac3_parse,
NULL,
};
......@@ -145,7 +145,7 @@ static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
static int ac3_parse_init(AVCodecParserContext *s1)
{
AC3ParseContext *s = s1->priv_data;
AACAC3ParseContext *s = s1->priv_data;
s->inbuf_ptr = s->inbuf;
s->header_size = AC3_HEADER_SIZE;
s->sync = ac3_sync;
......@@ -155,8 +155,8 @@ static int ac3_parse_init(AVCodecParserContext *s1)
AVCodecParser ac3_parser = {
{ CODEC_ID_AC3 },
sizeof(AC3ParseContext),
sizeof(AACAC3ParseContext),
ac3_parse_init,
ac3_parse,
ff_aac_ac3_parse,
NULL,
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment