← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/ps2/dsputil_mmi.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/ps2/dsputil_mmi.c
142
142
void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx)
143
143
{
144
144
    const int idct_algo= avctx->idct_algo;
145
 
    const int high_bit_depth = avctx->codec_id == CODEC_ID_H264 && avctx->bits_per_raw_sample > 8;
 
145
    const int high_bit_depth = avctx->bits_per_raw_sample > 8;
146
146
 
147
147
    if (!high_bit_depth) {
148
148
    c->clear_blocks = clear_blocks_mmi;
152
152
 
153
153
    c->put_pixels_tab[0][0] = put_pixels16_mmi;
154
154
    c->put_no_rnd_pixels_tab[0][0] = put_pixels16_mmi;
155
 
    }
156
155
 
157
156
    c->get_pixels = get_pixels_mmi;
 
157
    }
158
158
 
159
 
    if(idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_PS2){
 
159
    if (avctx->bits_per_raw_sample <= 8 &&
 
160
        (idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_PS2)) {
160
161
        c->idct_put= ff_mmi_idct_put;
161
162
        c->idct_add= ff_mmi_idct_add;
162
163
        c->idct    = ff_mmi_idct;