1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavformat
Michael Niedermayer ca2369cdee 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>
2014-03-12 03:18:12 +01:00
..
2014-03-08 12:36:57 +01:00
2013-12-25 17:14:32 +01:00
2014-03-11 13:24:53 +01:00
2014-03-06 00:30:27 +01:00
2013-12-13 11:57:39 +01:00
2014-01-16 00:38:27 +01:00
2014-02-28 00:07:31 +01:00
2013-12-25 17:38:29 +01:00
2013-12-23 16:28:44 +01:00
2014-03-11 13:22:49 +01:00
2013-12-25 17:38:29 +01:00
2014-02-22 20:51:13 +01:00
2013-12-25 17:38:29 +01:00
2014-02-24 02:24:21 +01:00
2014-02-05 22:36:42 +01:00
2014-02-09 14:29:07 +00:00
2014-03-09 18:09:39 +01:00
2014-01-29 00:48:50 +01:00
2013-12-25 17:38:29 +01:00
2013-12-25 17:38:30 +01:00
2014-03-04 22:54:13 +01:00
2014-03-04 22:54:13 +01:00
2014-03-08 12:36:57 +01:00
2014-01-08 23:56:05 +01:00
2014-03-08 12:36:57 +01:00