Merge pull request #27 from lawder/confilict

solve var name conflict
pili-engineering · Dec 20, 2016 · 9e602fc · 9e602fc
2 parents c6b8117 + f7219f5
commit 9e602fc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Pod/Classes/pili-librtmp/rtmp.c b/Pod/Classes/pili-librtmp/rtmp.c
@@ -303,7 +303,7 @@ void PILI_RTMP_UpdateBufferMS(PILI_RTMP *r, RTMPError *error) {
 #endif
 #define DEF_VERSTR OSS " 10,0,32,18"
 static const char DEFAULT_FLASH_VER[] = DEF_VERSTR;
-const PILI_AVal RTMP_DefaultFlashVer =
+const PILI_AVal PILI_RTMP_DefaultFlashVer =
     {(char *)DEFAULT_FLASH_VER, sizeof(DEFAULT_FLASH_VER) - 1};
 
 void PILI_RTMP_SetupStream(PILI_RTMP *r,
@@ -395,7 +395,7 @@ void PILI_RTMP_SetupStream(PILI_RTMP *r,
     if (flashVer && flashVer->av_len)
         r->Link.flashVer = *flashVer;
     else
-        r->Link.flashVer = RTMP_DefaultFlashVer;
+        r->Link.flashVer = PILI_RTMP_DefaultFlashVer;
     if (subscribepath && subscribepath->av_len)
         r->Link.subscribepath = *subscribepath;
     r->Link.seekTime = dStart;