• Michael Niedermayer's avatar
    Merge commit 'b519298a' · 54a71f2e
    Michael Niedermayer authored
    * commit 'b519298a':
      pixdesc: fix yuva 10bit bit depth
      avconv: deprecate the -vol option
      x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
      x86: af_volume: add SSE2-optimized s16 volume scaling
    
    Conflicts:
    	ffmpeg.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>
    54a71f2e
x86inc.asm 29.9 KB