[FFmpeg-cvslog] Merge commit 'e2811c2ede428a20aec3630bef4378f2927fb306' into release/2.2
Michael Niedermayer
git at videolan.org
Sun Mar 16 03:38:01 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 03:30:09 2014 +0100| [bdb219435e0bf97bc4c40b84417b8e39b4e49f30] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdb219435e0bf97bc4c40b84417b8e39b4e49f30
---
More information about the ffmpeg-cvslog
mailing list