← Back to branch summary

~noskcaj/ubuntu/saucy/libav/merge0.8.7-1

« back to all changes in this revision

Viewing changes to libavcodec/arm/dsputil_init_armv5te.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:30:00 UTC
  • mfrom: (1.2.8) (1.1.13 experimental)
  • Revision ID: package-import@ubuntu.com-20120112223000-cmfo7w78q13i2fd9
Tags: 4:0.8~beta2-1ubuntu1
* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, 
    x264, and xvid  (all in universe)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/arm/dsputil_init_armv5te.c
29
29
 
30
30
void av_cold ff_dsputil_init_armv5te(DSPContext* c, AVCodecContext *avctx)
31
31
{
32
 
    if (!avctx->lowres && (avctx->idct_algo == FF_IDCT_AUTO ||
33
 
                           avctx->idct_algo == FF_IDCT_SIMPLEARMV5TE)) {
 
32
    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 &&
 
33
        (avctx->idct_algo == FF_IDCT_AUTO ||
 
34
         avctx->idct_algo == FF_IDCT_SIMPLEARMV5TE)) {
34
35
        c->idct_put              = ff_simple_idct_put_armv5te;
35
36
        c->idct_add              = ff_simple_idct_add_armv5te;
36
37
        c->idct                  = ff_simple_idct_armv5te;