← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/aac_parser.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/aac_parser.c
40
40
    tmp.u64 = av_be2ne64(state);
41
41
    init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8);
42
42
 
43
 
    if ((size = ff_aac_parse_header(&bits, &hdr)) < 0)
 
43
    if ((size = avpriv_aac_parse_header(&bits, &hdr)) < 0)
44
44
        return 0;
45
45
    *need_next_header = 0;
46
46
    *new_frame_start  = 1;
61
61
 
62
62
 
63
63
AVCodecParser ff_aac_parser = {
64
 
    { CODEC_ID_AAC },
65
 
    sizeof(AACAC3ParseContext),
66
 
    aac_parse_init,
67
 
    ff_aac_ac3_parse,
68
 
    ff_parse_close,
 
64
    .codec_ids      = { CODEC_ID_AAC },
 
65
    .priv_data_size = sizeof(AACAC3ParseContext),
 
66
    .parser_init    = aac_parse_init,
 
67
    .parser_parse   = ff_aac_ac3_parse,
 
68
    .parser_close   = ff_parse_close,
69
69
};