FFmpeg/libavfilter/x86
Michael Niedermayer 54a71f2e6c Merge commit 'b519298a15'
* commit 'b519298a15':
  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
..
af_volume.asm Merge commit 'b519298a15' 2012-12-06 15:55:47 +01:00
af_volume_init.c Merge commit 'b519298a15' 2012-12-06 15:55:47 +01:00
gradfun.c Merge commit 'fa8fcab1e0' 2012-11-01 13:11:51 +01:00
hqdn3d.asm Merge commit '04581c8c77' 2012-10-31 13:57:09 +01:00
Makefile x86: af_volume: add SSE2-optimized s16 volume scaling 2012-12-05 11:23:37 -05:00
yadif.c Merge commit 'fa8fcab1e0' 2012-11-01 13:11:51 +01:00
yadif_template.c Merge commit 'ec36aa6944' 2012-08-31 13:01:30 +02:00