[FFmpeg-cvslog] Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  6 15:43:34 2012 +0100| [54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff
---