← Back to branch summary

~ubuntu-branches/ubuntu/quantal/libav/quantal-updates

« back to all changes in this revision

Viewing changes to libavcodec/ws-snd1.c

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-03-21 21:18:24 UTC
  • mfrom: (1.2.10)
  • Revision ID: package-import@ubuntu.com-20120321211824-n63p3v3s99q3mxrb
Tags: 4:0.8.1-0ubuntu1
https://launchpad.net/bugs/960949
* New upstream bug and security fix release (FFe: LP: #960949)
  - fixes the following CVEs:
    CVE-2012-0848, CVE-2012-0853, CVE-2012-0858, CVE-2011-3929,
    CVE-2011-3936, CVE-2011-3937, CVE-2011-3940, CVE-2011-3945,
    CVE-2011-3947, CVE-2011-3951, CVE-2011-3952

* Pull fix from Debian git to fix installation of avserver.conf and
  recordshow.sh into libav-tools; Thanks to Julien Cristau for spotting this!
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/ws-snd1.c
112
112
 
113
113
        /* make sure we don't write past the output buffer */
114
114
        switch (code) {
115
 
        case 0:  smp = 4;                              break;
116
 
        case 1:  smp = 2;                              break;
 
115
        case 0:  smp = 4*(count+1);                    break;
 
116
        case 1:  smp = 2*(count+1);                    break;
117
117
        case 2:  smp = (count & 0x20) ? 1 : count + 1; break;
118
118
        default: smp = count + 1;                      break;
119
119
        }