Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Oct 2012 16:41:17 +0000 (17:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Oct 2012 16:47:36 +0000 (17:47 +0100)
commita201639a01284003a055f195f4e850a0cf3fc2d5
tree959d66dc788f6d76941e646bbb49dea93209b231
parent788afee86e283535f37fdcb649b2f180ad305f75
parent7658295ba353b8bedb3af904f46cfb1ba0cea86a
Merge remote-tracking branch 'qatar/master'

* 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 e519990
  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: Michael Niedermayer <michaelni@gmx.at>
20 files changed:
configure
libavcodec/arm/h264pred_init_arm.c
libavcodec/h264pred.c
libavcodec/h264pred.h
libavcodec/h264pred_template.c
libavcodec/raw.c
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_init.c
libavformat/nut.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libswscale/input.c
libswscale/swscale.c
libswscale/swscale_unscaled.c
libswscale/utils.c
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pixdesctest
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip