~siretart/libav/trusty-security

« back to all changes in this revision

Viewing changes to libavcodec/arm/ac3dsp_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
* 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:
19
19
 */
20
20
 
21
21
#include <stdint.h>
 
22
 
 
23
#include "libavutil/arm/cpu.h"
22
24
#include "libavutil/attributes.h"
23
25
#include "libavcodec/ac3dsp.h"
24
26
#include "config.h"
39
41
 
40
42
av_cold void ff_ac3dsp_init_arm(AC3DSPContext *c, int bit_exact)
41
43
{
 
44
    int cpu_flags = av_get_cpu_flags();
 
45
 
42
46
    c->update_bap_counts         = ff_ac3_update_bap_counts_arm;
43
47
 
44
 
    if (HAVE_ARMV6) {
 
48
    if (have_armv6(cpu_flags)) {
45
49
        c->bit_alloc_calc_bap    = ff_ac3_bit_alloc_calc_bap_armv6;
46
50
    }
47
51
 
48
 
    if (HAVE_NEON) {
 
52
    if (have_neon(cpu_flags)) {
49
53
        c->ac3_exponent_min      = ff_ac3_exponent_min_neon;
50
54
        c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_neon;
51
55
        c->ac3_lshift_int16      = ff_ac3_lshift_int16_neon;