← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/arm/dsputil_init_arm.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler, Jonathan Nieder, Reinhard Tartler
  • Date: 2011-05-13 12:31:33 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (1.3.4 sid)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20110513123133-zqcsj91sf5489y4s
Tags: 4:0.7~beta2-1
[ Jonathan Nieder ]
* only install doc/APIChanges in *-dev and libav-doc packages
* move note on source package lineage to README.Debian
* install NEWS.Debian in libavcodec-dev
* use dpkg source format 3.0 (quilt)
* allow "debian/rules clean" as unprivileged user

[ Reinhard Tartler ]
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/arm/dsputil_init_arm.c
75
75
 
76
76
void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
77
77
{
 
78
    const int high_bit_depth = avctx->codec_id == CODEC_ID_H264 && avctx->bits_per_raw_sample > 8;
 
79
 
78
80
    ff_put_pixels_clamped = c->put_pixels_clamped;
79
81
    ff_add_pixels_clamped = c->add_pixels_clamped;
80
82
 
95
97
 
96
98
    c->add_pixels_clamped = ff_add_pixels_clamped_arm;
97
99
 
 
100
    if (!high_bit_depth) {
98
101
    c->put_pixels_tab[0][0] = ff_put_pixels16_arm;
99
102
    c->put_pixels_tab[0][1] = ff_put_pixels16_x2_arm;
100
103
    c->put_pixels_tab[0][2] = ff_put_pixels16_y2_arm;
112
115
    c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_arm;
113
116
    c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_arm;
114
117
    c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_arm;
 
118
    }
115
119
 
116
120
    if (HAVE_ARMV5TE) ff_dsputil_init_armv5te(c, avctx);
117
121
    if (HAVE_ARMV6)   ff_dsputil_init_armv6(c, avctx);