← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/dct.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/dct.c
28
28
 */
29
29
 
30
30
#include <math.h>
 
31
#include <string.h>
31
32
 
32
33
#include "libavutil/mathematics.h"
33
34
#include "dct.h"
208
209
    }
209
210
 
210
211
    s->dct32 = ff_dct32_float;
211
 
    if (HAVE_MMX)
212
 
        ff_dct_init_mmx(s);
 
212
    if (ARCH_X86)
 
213
        ff_dct_init_x86(s);
213
214
 
214
215
    return 0;
215
216
}