diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 03:16:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 03:18:12 +0100 |
| commit | ca2369cdee0d75708626d539e9eb8eb7e6f9cce3 (patch) | |
| tree | fab5e47e996f54fcfe0ac5502bed87a553bd8136 /.gitignore | |
| parent | 21d4c571fabe7e0bfc6de8214edb88d733b7624f (diff) | |
| parent | 8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab (diff) | |
| download | ffmpeg-ca2369cdee0d75708626d539e9eb8eb7e6f9cce3.tar.gz | |
Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'
* commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab':
http: Add support reading ICY metadata
Conflicts:
doc/protocols.texi
libavformat/http.c
See: a92fbe16f2dc118c0d3adc222484268831388648
See: 636273d3d4a8c42f51832e8bf83e566e875916bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions