...
with rtmp instance in sock
while sock error , set the flag of blinkok to false
delete dh
fix sock-read which cause long delay
fix sock_read bug
Merge branch 'Branch_43d9daf832c510c07ff27743f78ceb0aa4d6d546'
not ok, read packet failed
fix bug: rtmp_read_packet-> get channel id
Merge branch 'master' of https://github.com/kagajubo/rtmp

Conflicts:
	dh.h
	handshake.h
	log.h
	rtmplib.c
	rtmplib.h
	rtmpserver.c
	rtmpsock.c