← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg-extra/lucid-security

« back to all changes in this revision

Viewing changes to libswscale/swscale.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-12 11:45:36 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120612114536-y9tr1krewdu41h1x
Tags: 4:0.5.9-0ubuntu0.10.04.1
https://launchpad.net/bugs/1012132
* SECURITY UPDATE: Updated to libav 0.5.9 to fix multiple security
  issues. (LP: #1012132)
  - CVE-2011-3929
  - CVE-2011-3936
  - CVE-2011-3940
  - CVE-2011-3947
  - CVE-2011-3951
  - CVE-2011-3952
  - CVE-2012-0851
  - CVE-2012-0852
  - CVE-2012-0853
  - CVE-2012-0858
  - CVE-2012-0859
  - CVE-2012-0947
* Removed upstreamed patches:
  - CVE-2010-3429.patch
  - CVE-2010-3908.patch
  - CVE-2010-4704.patch
  - CVE-2011-0480.patch
  - CVE-2011-0722.patch
  - CVE-2011-0723.patch
  - CVE-2011-2161.patch
  - CVE-2011-3362.patch
  - CVE-2011-3504.patch
  - CVE-2011-4351.patch
  - CVE-2011-4353.patch
  - CVE-2011-4364.patch
  - CVE-2011-4579.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libswscale/swscale.c
960
960
#endif
961
961
 
962
962
#if ARCH_PPC
963
 
#if HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT
 
963
#if HAVE_ALTIVEC
964
964
#define COMPILE_ALTIVEC
965
965
#endif
966
966
#endif //ARCH_PPC
1649
1649
        return swScale_C;
1650
1650
 
1651
1651
#else
1652
 
#if ARCH_PPC
 
1652
#if ARCH_PPC && defined COMPILE_ALTIVEC
1653
1653
    if (flags & SWS_CPU_CAPS_ALTIVEC)
1654
1654
        return swScale_altivec;
1655
1655
    else