diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:47:35 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:52:53 +0200 |
commit | 69a5cd9feac5382c378ff1613f586b37f34d8961 (patch) | |
tree | cd150a2eee6fac15bcd4871c16f7c6def1e9d4ec /doc/libswscale.texi | |
parent | 2ba45778095cdd6e1438644e4797b76e9de6c672 (diff) | |
parent | 7601f9412a2d3387617a45966b65b452a632c27a (diff) | |
download | ffmpeg-69a5cd9feac5382c378ff1613f586b37f34d8961.tar.gz |
Merge commit '7601f9412a2d3387617a45966b65b452a632c27a'
* commit '7601f9412a2d3387617a45966b65b452a632c27a':
http: export icecast metadata as an option with name "metadata".
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/libswscale.texi')
0 files changed, 0 insertions, 0 deletions