~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-updates

« back to all changes in this revision

Viewing changes to libavcodec/aac_parser.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-03-13 09:18:28 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090313091828-n4ktby5eca487uhv
Tags: 3:0.svn20090303-1ubuntu1+unstripped1
merge from ubuntu.jaunty branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
    skip_bits(gbc, 11);          /* adts_buffer_fullness */
63
63
    rdb = get_bits(gbc, 2);      /* number_of_raw_data_blocks_in_frame */
64
64
 
65
 
    hdr->object_type    = aot;
 
65
    hdr->object_type    = aot + 1;
66
66
    hdr->chan_config    = ch;
67
67
    hdr->crc_absent     = crc_abs;
68
68
    hdr->num_aac_frames = rdb + 1;
113
113
    sizeof(AACAC3ParseContext),
114
114
    aac_parse_init,
115
115
    ff_aac_ac3_parse,
116
 
    NULL,
 
116
    ff_parse_close,
117
117
};