← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty-proposed

« back to all changes in this revision

Viewing changes to libavcodec/arm/aac.h

  • 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/aac.h
23
23
 
24
24
#include "config.h"
25
25
 
26
 
#if HAVE_NEON && HAVE_INLINE_ASM
 
26
#if HAVE_NEON_INLINE
27
27
 
28
28
#define VMUL2 VMUL2
29
29
static inline float *VMUL2(float *dst, const float *v, unsigned idx,
138
138
    return dst;
139
139
}
140
140
 
141
 
#endif /* HAVE_NEON && HAVE_INLINE_ASM */
 
141
#endif /* HAVE_NEON_INLINE */
142
142
 
143
143
#endif /* AVCODEC_ARM_AAC_H */