Michael Niedermayer
|
54a71f2e6c
|
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
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: Michael Niedermayer <michaelni@gmx.at>
|
2012-12-06 15:55:47 +01:00 |
|
Michael Niedermayer
|
b38c79bf23
|
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
lavfi: add volume filter
Conflicts:
Changelog
libavfilter/Makefile
libavfilter/af_volume.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-12-06 15:18:59 +01:00 |
Justin Ruggles
|
b384e031da
|
lavfi: add volume filter
Based on the volume filter in FFmpeg written by Stefano Sabatini
<stefasab@gmail.com>.
|
2012-12-05 11:23:37 -05:00 |
|
Justin Ruggles
|
f96f1e06a4
|
x86: af_volume: add SSE2-optimized s16 volume scaling
|
2012-12-05 11:23:37 -05:00 |