• Michael Niedermayer's avatar
    Merge commit '05b0998f' · bb2f4ae4
    Michael Niedermayer authored
    * commit '05b0998f':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bb2f4ae4
swscale_internal.h 37 KB