diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:14:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:14:41 +0100 |
| commit | 4a1e7a6fb7b82f8e39666de9e90f7de6190ea7b1 (patch) | |
| tree | 4e2c7d40a16eed42f8b1a13c90ae20a0911430b3 /libavfilter/dualinput.c | |
| parent | ff1e9822056804797be7c7844c577565d5aad21d (diff) | |
| parent | 6230de03aad9f26d5843afb913d196622e0b5b98 (diff) | |
| download | ffmpeg-4a1e7a6fb7b82f8e39666de9e90f7de6190ea7b1.tar.gz | |
Merge commit '6230de03aad9f26d5843afb913d196622e0b5b98' into release/2.2
* commit '6230de03aad9f26d5843afb913d196622e0b5b98':
vf_frei0r: refactor library loading from env variable
Conflicts:
configure
libavfilter/vf_frei0r.c
Not merged, we use av_strtok() which leads to simpler code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/dualinput.c')
0 files changed, 0 insertions, 0 deletions