]> granicus.if.org Git - rtmpdump/commitdiff
Minor fixes from Antti Ajanki
authorhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Tue, 9 Feb 2010 20:04:27 +0000 (20:04 +0000)
committerhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Tue, 9 Feb 2010 20:04:27 +0000 (20:04 +0000)
git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@246 400ebc74-4327-4243-bc38-086b20814532

rtmp.c

diff --git a/rtmp.c b/rtmp.c
index ffe0bfe2db8361ec7a8b8db4223d6e1b4ccc6533..117bfefc99a6a9e19e46ba9dc946c9111b7b8251 100644 (file)
--- a/rtmp.c
+++ b/rtmp.c
@@ -493,9 +493,9 @@ RTMP_ConnectStream(RTMP * r, double seekTime, uint32_t dLength)
              (packet.m_packetType == RTMP_PACKET_TYPE_VIDEO) ||
              (packet.m_packetType == RTMP_PACKET_TYPE_INFO))
            {
-             Log(LOGDEBUG, "%s, received FLV packet before play()!",
-                 __FUNCTION__);
-             break;
+             Log(LOGWARNING, "Received FLV packet before play()! Ignoring.");
+               RTMPPacket_Free(&packet);
+             continue;
            }
 
          RTMP_ClientPacket(r, &packet);
@@ -1061,7 +1061,7 @@ SendFCSubscribe(RTMP * r, AVal * subscribepath)
   packet.m_hasAbsTimestamp = 0;
   packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE;
 
-  Log(LOGDEBUG, "FCSubscribe: %s", subscribepath);
+  Log(LOGDEBUG, "FCSubscribe: %s", subscribepath->av_val);
   char *enc = packet.m_body;
   enc = AMF_EncodeString(enc, pend, &av_FCSubscribe);
   enc = AMF_EncodeNumber(enc, pend, 4.0);
@@ -1587,6 +1587,7 @@ HandleInvoke(RTMP * r, const char *body, unsigned int nBodySize)
        {
          r->m_stream_id = -1;
          RTMP_Close(r);
+         Log(LOGERROR, "Closing connection: %s", code.av_val);
        }
 
       if (AVMATCH(&code, &av_NetStream_Play_Start))