← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/arm/dsputil_init_armv6.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/arm/dsputil_init_armv6.c
72
72
 
73
73
void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx)
74
74
{
75
 
    const int high_bit_depth = avctx->codec_id == CODEC_ID_H264 && avctx->bits_per_raw_sample > 8;
 
75
    const int high_bit_depth = avctx->bits_per_raw_sample > 8;
76
76
 
77
 
    if (!avctx->lowres && (avctx->idct_algo == FF_IDCT_AUTO ||
78
 
                           avctx->idct_algo == FF_IDCT_SIMPLEARMV6)) {
 
77
    if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 &&
 
78
        (avctx->idct_algo == FF_IDCT_AUTO ||
 
79
         avctx->idct_algo == FF_IDCT_SIMPLEARMV6)) {
79
80
        c->idct_put              = ff_simple_idct_put_armv6;
80
81
        c->idct_add              = ff_simple_idct_add_armv6;
81
82
        c->idct                  = ff_simple_idct_armv6;
105
106
    c->avg_pixels_tab[1][0] = ff_avg_pixels8_armv6;
106
107
    }
107
108
 
 
109
    if (!high_bit_depth)
 
110
        c->get_pixels = ff_get_pixels_armv6;
108
111
    c->add_pixels_clamped = ff_add_pixels_clamped_armv6;
109
 
    c->get_pixels = ff_get_pixels_armv6;
110
112
    c->diff_pixels = ff_diff_pixels_armv6;
111
113
 
112
114
    c->pix_abs[0][0] = ff_pix_abs16_armv6;