diff options
| author | Michael Niedermayer <[email protected]> | 2014-05-01 14:14:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-05-01 14:14:10 +0200 |
| commit | 154d80eae70b73c683e70a157e73173aabb26a58 (patch) | |
| tree | 98854991ca12fbd5ddaebaa641919b978507088a /libavformat/mpeg.c | |
| parent | 7a0e689c4517d8e6ccec6027354bd827965a9ba2 (diff) | |
| parent | 1c0210c7981b6a61043d9171f506b435ff5a1f5e (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavformat/mpeg.c')
0 files changed, 0 insertions, 0 deletions