[FFmpeg-cvslog] Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  6 15:18:59 2012 +0100| [b38c79bf2327391d4fb8a7c271301ff408bdc71e] | committer: Michael Niedermayer

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

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