summaryrefslogtreecommitdiffstats
path: root/version.sh
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-06 15:18:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-06 15:18:59 +0100
commitb38c79bf2327391d4fb8a7c271301ff408bdc71e (patch)
treecd3c1092a34d8e417fe4c834b23f137227aa83e3 /version.sh
parent377d201790bbe08185b91b50c8bc4a3bbf951618 (diff)
parentb384e031daeb1ac612620985e3e5377bc587559c (diff)
downloadffmpeg-streaming-b38c79bf2327391d4fb8a7c271301ff408bdc71e.zip
ffmpeg-streaming-b38c79bf2327391d4fb8a7c271301ff408bdc71e.tar.gz
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>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud