diff options
| author | Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> | 2008-03-28 19:59:58 +0000 |
|---|---|---|
| committer | Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> | 2008-03-28 19:59:58 +0000 |
| commit | be1e2a2bfa592ff14355c6b97e90c530e2c0fcc0 (patch) | |
| tree | a9d7171af4f5eda9a96a8aff32b824034df9b474 /libavcodec/aac_parser.c | |
| parent | 5610f20ed4358af3c1380ceb79ee51e258df79bf (diff) | |
| download | ffmpeg-be1e2a2bfa592ff14355c6b97e90c530e2c0fcc0.tar.gz | |
removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlag
Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac_parser.c')
| -rw-r--r-- | libavcodec/aac_parser.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index 45c8b95e76..3a20129c06 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -23,7 +23,6 @@ #include "parser.h" #include "aac_ac3_parser.h" #include "bitstream.h" -#include "ac3.h" #define AAC_HEADER_SIZE 7 @@ -39,7 +38,7 @@ static const int aac_channels[8] = { }; -static int aac_sync(AACAC3ParseContext *hdr_info) +static int aac_sync(AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag) { GetBitContext bits; int size, rdb, ch, sr; @@ -77,6 +76,7 @@ static int aac_sync(AACAC3ParseContext *hdr_info) hdr_info->sample_rate = aac_sample_rates[sr]; hdr_info->samples = (rdb + 1) * 1024; hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples; + *flag = FRAME_COMPLETE; return size; } @@ -84,7 +84,6 @@ static int aac_sync(AACAC3ParseContext *hdr_info) static av_cold int aac_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->stream_type = EAC3_STREAM_TYPE_INDEPENDENT; s->inbuf_ptr = s->inbuf; s->header_size = AAC_HEADER_SIZE; s->sync = aac_sync; |