Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jan 2013 13:06:22 +0000 (14:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jan 2013 13:11:31 +0000 (14:11 +0100)
commitbb2f4ae434223e99f131100f4bc71762b79eb6c5
treec852670be02a3ec5972b389a238eabcf59f04095
parent51e9d2dbc8f8e7aed216222a496cc7e588afa217
parent05b0998f511ffa699407465d48c7d5805f746ad2
Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
  dsputil: Fix error by not using redzone and register name
  swscale: GBRP output support

Conflicts:
libswscale/output.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.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>
libavcodec/x86/hpeldsp.asm
libavcodec/x86/mpeg4qpel.asm
libswscale/output.c
libswscale/swscale_internal.h
libswscale/utils.c