← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/mlib/dsputil_mlib.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/mlib/dsputil_mlib.c
421
421
 
422
422
void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx)
423
423
{
424
 
    const int high_bit_depth = avctx->codec_id == CODEC_ID_H264 && avctx->bits_per_raw_sample > 8;
 
424
    const int high_bit_depth = avctx->bits_per_raw_sample > 8;
425
425
 
426
 
    c->get_pixels  = get_pixels_mlib;
427
426
    c->diff_pixels = diff_pixels_mlib;
428
427
    c->add_pixels_clamped = add_pixels_clamped_mlib;
429
428
 
430
429
    if (!high_bit_depth) {
 
430
    c->get_pixels  = get_pixels_mlib;
 
431
 
431
432
    c->put_pixels_tab[0][0] = put_pixels16_mlib;
432
433
    c->put_pixels_tab[0][1] = put_pixels16_x2_mlib;
433
434
    c->put_pixels_tab[0][2] = put_pixels16_y2_mlib;