← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to libavcodec/ppc/dsputil_ppc.h

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/ppc/dsputil_ppc.h
21
21
#ifndef AVCODEC_PPC_DSPUTIL_PPC_H
22
22
#define AVCODEC_PPC_DSPUTIL_PPC_H
23
23
 
24
 
#ifdef CONFIG_POWERPC_PERF
 
24
#if CONFIG_POWERPC_PERF
25
25
void powerpc_display_perf_report(void);
26
26
/* the 604* have 2, the G3* have 4, the G4s have 6,
27
27
   and the G5 are completely different (they MUST use
68
68
};
69
69
extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total];
70
70
 
71
 
#ifndef HAVE_PPC64
 
71
#if !HAVE_PPC64
72
72
#define POWERP_PMC_DATATYPE unsigned long
73
73
#define POWERPC_GET_PMC1(a) __asm__ volatile("mfspr %0, 937" : "=r" (a))
74
74
#define POWERPC_GET_PMC2(a) __asm__ volatile("mfspr %0, 938" : "=r" (a))