← Back to branch summary

~siretart/libav/merge.raring.libav-0.8.6

« back to all changes in this revision

Viewing changes to libavcodec/vorbisdec.c

  • Committer: Reinhard Tartler
  • Date: 2013-03-27 06:53:14 UTC
  • mfrom: (1.3.32 sid)
  • Revision ID: siretart@tauware.de-20130327065314-fs4shpt6y2h46ekf
first merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/vorbisdec.c
587
587
            floor_setup->data.t0.order          = get_bits(gb,  8);
588
588
            floor_setup->data.t0.rate           = get_bits(gb, 16);
589
589
            floor_setup->data.t0.bark_map_size  = get_bits(gb, 16);
 
590
            if (floor_setup->data.t0.bark_map_size == 0) {
 
591
                av_log(vc->avccontext, AV_LOG_ERROR,
 
592
                       "Floor 0 bark map size is 0.\n");
 
593
                return AVERROR_INVALIDDATA;
 
594
            }
590
595
            floor_setup->data.t0.amplitude_bits = get_bits(gb,  6);
591
596
            /* zero would result in a div by zero later *
592
597
             * 2^0 - 1 == 0                             */