highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change aac and ac3 parsers to use ff_combine_frame().

Browse Source 
Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2008-04-19 01:50:40 +00:00
parent bf237413f3
commit 454064ad1e
4 changed files with 44 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/aac_parser.c
View File

@ -27,12 +27,13 @@
#define AAC_HEADER_SIZE 7
static int aac_sync(AACAC3ParseContext *hdr_info)
static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info)
{
GetBitContext bits;
int size, rdb, ch, sr;
uint64_t tmp = be2me_64(state);
init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8);
init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);
if(get_bits(&bits, 12) != 0xfff)
return 0;
@ -72,7 +73,6 @@ static int aac_sync(AACAC3ParseContext *hdr_info)
static av_cold int aac_parse_init(AVCodecParserContext *s1)
{
AACAC3ParseContext *s = s1->priv_data;
s->inbuf_ptr = s->inbuf;
s->header_size = AAC_HEADER_SIZE;
s->sync = aac_sync;
return 0;