diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:45:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:47:19 +0200 |
| commit | e8a966e361a7512ecfb03073074c8b9084229e69 (patch) | |
| tree | eecf4e8960441b94232d1a0ac15ecd0277d11661 /libavformat/icodec.c | |
| parent | 19b9e07ef5fdd8558735538a04fac7f428df190c (diff) | |
| parent | 33a7b453a8e1f090c694ea4f36769dc837be88f0 (diff) | |
| download | ffmpeg-e8a966e361a7512ecfb03073074c8b9084229e69.tar.gz | |
Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'
* commit '33a7b453a8e1f090c694ea4f36769dc837be88f0':
doc: mention option to mix shared/static libraries
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/icodec.c')
0 files changed, 0 insertions, 0 deletions