• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a201639a
    Michael Niedermayer authored
    * qatar/master:
      pixfmt: support more yuva formats
      swscale: support gray to 9bit and 10bit formats
      configure: rewrite print_config() function using awk
      FATE: fix (AD)PCM test dependencies broken in e519990c
      Use ptrdiff_t instead of int for intra pred "stride" function parameter.
      x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.
    
    Conflicts:
    	libavcodec/h264pred.c
    	libavcodec/h264pred_template.c
    	libavutil/pixfmt.h
    	libswscale/swscale_unscaled.c
    	tests/ref/lavfi/pixdesc
    	tests/ref/lavfi/pixfmts_copy
    	tests/ref/lavfi/pixfmts_null
    	tests/ref/lavfi/pixfmts_scale
    	tests/ref/lavfi/pixfmts_vflip
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a201639a
h264pred_template.c 41.1 KB