winlin 931370e9f6 Merge branch '2.0release' into develop		2015-04-07 10:30:53 +08:00
..
app	refine hls info, show the deviation in seconds and pieces.	2015-04-07 10:30:45 +08:00
core	for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157.	2015-04-04 13:30:13 +08:00
kernel	fix the bug of h.264 bit stream demux.	2015-04-04 18:24:07 +08:00
libs	refine the h264 parser, one ts message should parsed to one rtmp/flv message.	2015-04-04 15:53:36 +08:00
main	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00
protocol	refine the h264 parser, one ts message should parsed to one rtmp/flv message.	2015-04-04 15:53:36 +08:00
utest	fix compile errors.	2015-04-03 11:30:59 +08:00