Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Dec 2012 14:18:59 +0000 (15:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Dec 2012 14:18:59 +0000 (15:18 +0100)
commitb38c79bf2327391d4fb8a7c271301ff408bdc71e
treecd3c1092a34d8e417fe4c834b23f137227aa83e3
parent377d201790bbe08185b91b50c8bc4a3bbf951618
parentb384e031daeb1ac612620985e3e5377bc587559c
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>
doc/filters.texi
libavfilter/Makefile
libavfilter/af_volume.h
libavfilter/af_volume_justin.c
libavfilter/allfilters.c
libavfilter/version.h