diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 14:13:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 14:14:13 +0200 |
| commit | 491c52d3b077dc1f298322a719059398a5f76af8 (patch) | |
| tree | fd1c32bfdcc217e39a7a31aa5b07ffee3491cff7 /libavcodec/png.c | |
| parent | e3dc2c86fc4178b100484c54f12c88705cdf6724 (diff) | |
| parent | eb9244f20210fd420fb9b3c98126f9cae525d1cc (diff) | |
| download | ffmpeg-491c52d3b077dc1f298322a719059398a5f76af8.tar.gz | |
Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'
* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
Add Icecast protocol
Conflicts:
Changelog
configure
doc/protocols.texi
libavformat/icecast.c
libavformat/version.h
See: e3dc2c86fc4178b100484c54f12c88705cdf6724
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/png.c')
0 files changed, 0 insertions, 0 deletions