diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 03:31:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 03:31:10 +0100 |
| commit | 669043db811a6dec2236284a40117fdbf1d32ba1 (patch) | |
| tree | 80765b5dcf23dac5f67e9ee54d73b5f784fafe9a /libavcodec/libgsm.c | |
| parent | e8e91a32e5ce3f7bc57634597684da8dcb334aec (diff) | |
| parent | ead0dd3cf6e524743a8cedc61223423ac6d6e784 (diff) | |
| download | ffmpeg-669043db811a6dec2236284a40117fdbf1d32ba1.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
lavfi/frei0r: factorize plugin loading with static path
lavfi/frei0r: search plugins in lib64 dirs on all architectures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libgsm.c')
0 files changed, 0 insertions, 0 deletions