diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:40:45 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:41:20 +0200 |
commit | 9c010ba66800fd335cc389c2a2b664216be985ae (patch) | |
tree | 33d908e655761d82a10935f10705ddf9a42ad2f3 /libavfilter/af_biquads.c | |
parent | 818ff7ff5a192c4b0999b375e555541f05b6730d (diff) | |
parent | 0d449c81b3dd25835ae6ac849cdd150f35b9c5c6 (diff) | |
download | ffmpeg-9c010ba66800fd335cc389c2a2b664216be985ae.tar.gz |
Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'
* commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6':
lavfi: Add library identifier
Conflicts:
libavfilter/version.h
See: a70b4935f1867797b62312c20035025fad8b1f94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_biquads.c')
0 files changed, 0 insertions, 0 deletions