← Back to branch summary

~ubuntu-branches/ubuntu/vivid/libav/vivid

« back to all changes in this revision

Viewing changes to libavcodec/arm/mpegaudiodsp_init_arm.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-10-22 23:24:08 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: package-import@ubuntu.com-20131022232408-b8tvvn4pyzri9mi3
Tags: 6:9.10-1ubuntu1
https://launchpad.net/bugs/1243235
https://launchpad.net/bugs/1180288
https://launchpad.net/bugs/1242802
* Build all -extra flavors from this source package, as libav got demoted
  from main to universe, cf LP: #1243235
* Simplify debian/rules to follow exactly the code that debian executes
* New upstream (LP: #1180288) fixes lots of security issues (LP: #1242802)
* Merge from unstable, remaining changes:
  - build-depend on libtiff5-dev rather than libtiff4-dev,
    avoids FTBFS caused by imlib
  - follow the regular debian codepaths

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/arm/mpegaudiodsp_init_arm.c
19
19
 */
20
20
 
21
21
#include <stdint.h>
 
22
 
 
23
#include "libavutil/arm/cpu.h"
22
24
#include "libavcodec/mpegaudiodsp.h"
23
25
#include "config.h"
24
26
 
27
29
 
28
30
void ff_mpadsp_init_arm(MPADSPContext *s)
29
31
{
30
 
    if (HAVE_ARMV6) {
 
32
    int cpu_flags = av_get_cpu_flags();
 
33
 
 
34
    if (have_armv6(cpu_flags)) {
31
35
        s->apply_window_fixed = ff_mpadsp_apply_window_fixed_armv6;
32
36
    }
33
37
}