← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ffmpeg/quantal

« back to all changes in this revision

Viewing changes to libavcodec/aac.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2010-06-16 12:53:24 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100616125324-kbhhjn7012ufc79t
Tags: 4:0.6-1ubuntu1
https://launchpad.net/bugs/585330
https://launchpad.net/bugs/93849
https://launchpad.net/bugs/557319
* merge from debian/experimental. remaining changes:
  - don't disable encoders
  - don't build against libfaad, libdirac and libopenjpeg (all in universe)
* new upstream release
  - internal vorbis encoder is disabled. LP: #585330
  - includes native AMR-NB decoder, LP: #93849
  - api-example is fixed: LP: #557319

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/aac.c
1954
1954
    int err, elem_id, data_size_tmp;
1955
1955
    int buf_consumed;
1956
1956
    int samples = 1024, multiplier;
 
1957
    int buf_offset;
1957
1958
 
1958
1959
    init_get_bits(&gb, buf, buf_size * 8);
1959
1960
 
2065
2066
        ac->output_configured = OC_LOCKED;
2066
2067
 
2067
2068
    buf_consumed = (get_bits_count(&gb) + 7) >> 3;
2068
 
    return buf_size > buf_consumed ? buf_consumed : buf_size;
 
2069
    for (buf_offset = buf_consumed; buf_offset < buf_size; buf_offset++)
 
2070
        if (buf[buf_offset])
 
2071
            break;
 
2072
 
 
2073
    return buf_size > buf_offset ? buf_consumed : buf_size;
2069
2074
}
2070
2075
 
2071
2076
static av_cold int aac_decode_close(AVCodecContext *avccontext)