Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Dec 2012 14:43:34 +0000 (15:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Dec 2012 14:55:47 +0000 (15:55 +0100)
commit54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff
treed25dd9b537de12e72a9486cb5b425de8022d2862
parent1bb547192f6e9bd28b55f1f11d43bcc216976ac7
parentb519298a1578e0c895d53d4b4ed8867b1c031a56
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>
ffmpeg_filter.c
libavfilter/af_volume.h
libavfilter/af_volume_justin.c
libavfilter/x86/af_volume.asm
libavfilter/x86/af_volume_init.c
libavutil/x86/x86inc.asm