← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/x86/mlpdsp.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/x86/mlpdsp.c
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
20
 */
21
21
 
22
 
#include "libavutil/x86_cpu.h"
23
 
#include "libavcodec/dsputil.h"
 
22
#include "libavutil/internal.h"
 
23
#include "libavutil/x86/asm.h"
 
24
#include "libavcodec/mlpdsp.h"
24
25
#include "libavcodec/mlp.h"
25
26
 
26
 
#if HAVE_7REGS
27
 
 
28
 
extern void ff_mlp_firorder_8;
29
 
extern void ff_mlp_firorder_7;
30
 
extern void ff_mlp_firorder_6;
31
 
extern void ff_mlp_firorder_5;
32
 
extern void ff_mlp_firorder_4;
33
 
extern void ff_mlp_firorder_3;
34
 
extern void ff_mlp_firorder_2;
35
 
extern void ff_mlp_firorder_1;
36
 
extern void ff_mlp_firorder_0;
37
 
 
38
 
extern void ff_mlp_iirorder_4;
39
 
extern void ff_mlp_iirorder_3;
40
 
extern void ff_mlp_iirorder_2;
41
 
extern void ff_mlp_iirorder_1;
42
 
extern void ff_mlp_iirorder_0;
 
27
#if HAVE_7REGS && HAVE_INLINE_ASM
 
28
 
 
29
extern char ff_mlp_firorder_8;
 
30
extern char ff_mlp_firorder_7;
 
31
extern char ff_mlp_firorder_6;
 
32
extern char ff_mlp_firorder_5;
 
33
extern char ff_mlp_firorder_4;
 
34
extern char ff_mlp_firorder_3;
 
35
extern char ff_mlp_firorder_2;
 
36
extern char ff_mlp_firorder_1;
 
37
extern char ff_mlp_firorder_0;
 
38
 
 
39
extern char ff_mlp_iirorder_4;
 
40
extern char ff_mlp_iirorder_3;
 
41
extern char ff_mlp_iirorder_2;
 
42
extern char ff_mlp_iirorder_1;
 
43
extern char ff_mlp_iirorder_0;
43
44
 
44
45
static const void *firtable[9] = { &ff_mlp_firorder_0, &ff_mlp_firorder_1,
45
46
                                   &ff_mlp_firorder_2, &ff_mlp_firorder_3,
171
172
    );
172
173
}
173
174
 
174
 
#endif /* HAVE_7REGS */
 
175
#endif /* HAVE_7REGS && HAVE_INLINE_ASM */
175
176
 
176
 
void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx)
 
177
void ff_mlpdsp_init_x86(MLPDSPContext *c)
177
178
{
178
 
#if HAVE_7REGS
 
179
#if HAVE_7REGS && HAVE_INLINE_ASM
179
180
    c->mlp_filter_channel = mlp_filter_channel_x86;
180
181
#endif
181
182
}