diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:54:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:54:31 +0200 |
| commit | 313d75cd4300316f6c8de7ef3473275f454e986a (patch) | |
| tree | de3cb7f5e52c196d78ceb9dd140dd25399255203 /doc/ffplay.texi | |
| parent | 69a5cd9feac5382c378ff1613f586b37f34d8961 (diff) | |
| parent | 7e38903b5c86a759549e70647ae42bb22d353b14 (diff) | |
| download | ffmpeg-313d75cd4300316f6c8de7ef3473275f454e986a.tar.gz | |
Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'
* commit '7e38903b5c86a759549e70647ae42bb22d353b14':
http: enable icy metadata by default.
Conflicts:
Changelog
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffplay.texi')
0 files changed, 0 insertions, 0 deletions