• Michael Niedermayer's avatar
    Merge commit '33c827f6' · e827f656
    Michael Niedermayer authored
    * commit '33c827f6':
      swscale: Properly scale YUV
    
    Conflicts:
    	libswscale/swscale_unscaled.c
    	tests/ref/fate/filter-pixdesc-yuv420p10be
    	tests/ref/fate/filter-pixdesc-yuv420p10le
    	tests/ref/fate/filter-pixdesc-yuv420p9be
    	tests/ref/fate/filter-pixdesc-yuv420p9le
    	tests/ref/fate/filter-pixdesc-yuva420p10be
    	tests/ref/fate/filter-pixdesc-yuva420p10le
    	tests/ref/fate/filter-pixdesc-yuva420p9be
    	tests/ref/fate/filter-pixdesc-yuva420p9le
    	tests/ref/fate/filter-pixfmts-copy
    	tests/ref/fate/filter-pixfmts-null
    	tests/ref/fate/filter-pixfmts-scale
    	tests/ref/fate/filter-pixfmts-vflip
    
    See: abe0b8e9Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e827f656
swscale_unscaled.c 73 KB