← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/aac_adtstoasc_bsf.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_adtstoasc_bsf.c
55
55
        if (show_bits(&gb, 12) != 0xfff)
56
56
            return 0;
57
57
 
58
 
    if (ff_aac_parse_header(&gb, &hdr) < 0) {
 
58
    if (avpriv_aac_parse_header(&gb, &hdr) < 0) {
59
59
        av_log(avctx, AV_LOG_ERROR, "Error parsing ADTS frame header!\n");
60
60
        return -1;
61
61
    }
72
72
        int            pce_size = 0;
73
73
        uint8_t        pce_data[MAX_PCE_SIZE];
74
74
        if (!hdr.chan_config) {
75
 
            init_get_bits(&gb, buf, buf_size);
 
75
            init_get_bits(&gb, buf, buf_size * 8);
76
76
            if (get_bits(&gb, 3) != 5) {
77
77
                av_log_missing_feature(avctx, "PCE based channel configuration, where the PCE is not the first syntax element is", 0);
78
78
                return -1;
79
79
            }
80
80
            init_put_bits(&pb, pce_data, MAX_PCE_SIZE);
81
 
            pce_size = ff_copy_pce_data(&pb, &gb)/8;
 
81
            pce_size = avpriv_copy_pce_data(&pb, &gb)/8;
82
82
            flush_put_bits(&pb);
83
83
            buf_size -= get_bits_count(&gb)/8;
84
84
            buf      += get_bits_count(&gb)/8;