Changeset 154d80ea in ffmpeg

Timestamp:

May 1, 2014, 12:14:10 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

82e4f398

Parents:

7a0e689c (diff), 1c0210c7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'

• commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e': lavfi: add Bauer stereo-to-binaural audio filter

Conflicts:

Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)