Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Aug 2011 20:23:40 +0000 (22:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Aug 2011 20:24:47 +0000 (22:24 +0200)
commitca1dfea12771b585846fb86aa08c3d7f066a3cc4
tree6db034b36245b9fe51d9a41d41be1718a3be8b89
parent75af0e6a1601a4246d6409ca28dc80a3ba0e8d6e
parent3304a1e69a8a050eb66d2304acd2d01354fa1aac
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: add dithering to yuv2yuvX_altivec_real
  rv34: free+allocate buffer instead of reallocating it to preserve alignment
  h264: add missing brackets.
  swscale: use 15-bit intermediates for 9/10-bit scaling.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_refs.c
libavcodec/rv34.c
libswscale/ppc/swscale_altivec.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixfmts_scale