Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:59:50 +0000 (14:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:59:50 +0000 (14:59 +0100)
* commit '2c01ad8b206d326700974438f7193f22be416eb1':
  dsputil_template: Detemplatize the code

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dsputil.c
libavcodec/dsputil_template.c

@@@ -2814,14 -2610,10 +2806,14 @@@ av_cold void ff_dsputil_init(DSPContex
      switch (avctx->bits_per_raw_sample) {
      case 9:
      case 10:
-         BIT_DEPTH_FUNCS(16);
 +    case 12:
 +    case 14:
+         c->get_pixels = get_pixels_16_c;
          break;
      default:
 -        c->get_pixels = get_pixels_8_c;
 +        if (avctx->bits_per_raw_sample<=8 || avctx->codec_type != AVMEDIA_TYPE_VIDEO) {
-             BIT_DEPTH_FUNCS(8);
++            c->get_pixels = get_pixels_8_c;
 +        }
          break;
      }
  
Simple merge