diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 13:26:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 13:26:48 +0100 |
| commit | d63b032d64e96f108c1524514898eafb4144e183 (patch) | |
| tree | d63fbed9d91c365ee503a0dc35a99584c40397a7 /libavresample/audio_mix.c | |
| parent | bfe03205a86c63edd4246a51f70284a2874ea352 (diff) | |
| parent | 61b323ce7c7cdc101eadfd7de2203922b8a39e8d (diff) | |
| download | ffmpeg-d63b032d64e96f108c1524514898eafb4144e183.tar.gz | |
Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'
* commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d':
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 'libavresample/audio_mix.c')
0 files changed, 0 insertions, 0 deletions