diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:30:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:30:09 +0100 |
| commit | bdb219435e0bf97bc4c40b84417b8e39b4e49f30 (patch) | |
| tree | 6c66501b4be9c6b4e5e5d79cbde8e1c4f080e968 /libavformat/g723_1.c | |
| parent | a7338ae8acf373244ab28e134f0e09fd745cf383 (diff) | |
| parent | e2811c2ede428a20aec3630bef4378f2927fb306 (diff) | |
| download | ffmpeg-bdb219435e0bf97bc4c40b84417b8e39b4e49f30.tar.gz | |
Merge commit 'e2811c2ede428a20aec3630bef4378f2927fb306' into release/2.2
* commit 'e2811c2ede428a20aec3630bef4378f2927fb306':
http: Add support reading ICY metadata
Conflicts:
doc/protocols.texi
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/g723_1.c')
0 files changed, 0 insertions, 0 deletions