virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-05-08 23:29:07 +00:00
parent 99ff31dc75
commit 679c2294cb
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aac_ac3_parser.c
View File

@ -23,12 +23,12 @@
#include "parser.h" #include "parser.h"
#include "aac_ac3_parser.h" #include "aac_ac3_parser.h"
int ac3_parse(AVCodecParserContext *s1, int ff_aac_ac3_parse(AVCodecParserContext *s1,
AVCodecContext *avctx, AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size, const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
AC3ParseContext *s = s1->priv_data; AACAC3ParseContext *s = s1->priv_data;
const uint8_t *buf_ptr; const uint8_t *buf_ptr;
int len, sample_rate, bit_rate, channels, samples; int len, sample_rate, bit_rate, channels, samples;

6
libavcodec/aac_ac3_parser.h
View File

@ -23,16 +23,16 @@
#ifndef AAC_AC3_PARSER_H #ifndef AAC_AC3_PARSER_H
#define AAC_AC3_PARSER_H #define AAC_AC3_PARSER_H
typedef struct AC3ParseContext { typedef struct AACAC3ParseContext {
uint8_t *inbuf_ptr; uint8_t *inbuf_ptr;
int frame_size; int frame_size;
int header_size; int header_size;
int (*sync)(const uint8_t *buf, int *channels, int *sample_rate, int (*sync)(const uint8_t *buf, int *channels, int *sample_rate,
int *bit_rate, int *samples); int *bit_rate, int *samples);
uint8_t inbuf[8192]; /* input buffer */ uint8_t inbuf[8192]; /* input buffer */
} AC3ParseContext; } AACAC3ParseContext;
int ac3_parse(AVCodecParserContext *s1, int ff_aac_ac3_parse(AVCodecParserContext *s1,
AVCodecContext *avctx, AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size, const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size); const uint8_t *buf, int buf_size);

6
libavcodec/aac_parser.c
View File

@ -80,7 +80,7 @@ static int aac_sync(const uint8_t *buf, int *channels, int *sample_rate,
static int aac_parse_init(AVCodecParserContext *s1) static int aac_parse_init(AVCodecParserContext *s1)
{ {
AC3ParseContext *s = s1->priv_data; AACAC3ParseContext *s = s1->priv_data;
s->inbuf_ptr = s->inbuf; s->inbuf_ptr = s->inbuf;
s->header_size = AAC_HEADER_SIZE; s->header_size = AAC_HEADER_SIZE;
s->sync = aac_sync; s->sync = aac_sync;
@ -90,8 +90,8 @@ static int aac_parse_init(AVCodecParserContext *s1)
AVCodecParser aac_parser = { AVCodecParser aac_parser = {
{ CODEC_ID_AAC }, { CODEC_ID_AAC },
sizeof(AC3ParseContext), sizeof(AACAC3ParseContext),
aac_parse_init, aac_parse_init,
ac3_parse, ff_aac_ac3_parse,
NULL, NULL,
}; };

6
libavcodec/ac3_parser.c
View File

@ -145,7 +145,7 @@ static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
static int ac3_parse_init(AVCodecParserContext *s1) static int ac3_parse_init(AVCodecParserContext *s1)
{ {
AC3ParseContext *s = s1->priv_data; AACAC3ParseContext *s = s1->priv_data;
s->inbuf_ptr = s->inbuf; s->inbuf_ptr = s->inbuf;
s->header_size = AC3_HEADER_SIZE; s->header_size = AC3_HEADER_SIZE;
s->sync = ac3_sync; s->sync = ac3_sync;
@ -155,8 +155,8 @@ static int ac3_parse_init(AVCodecParserContext *s1)
AVCodecParser ac3_parser = { AVCodecParser ac3_parser = {
{ CODEC_ID_AC3 }, { CODEC_ID_AC3 },
sizeof(AC3ParseContext), sizeof(AACAC3ParseContext),
ac3_parse_init, ac3_parse_init,
ac3_parse, ff_aac_ac3_parse,
NULL, NULL,
}; };