Skip to content

Commit

Permalink
update linux build
Browse files Browse the repository at this point in the history
  • Loading branch information
jinlong0813 committed Oct 23, 2018
1 parent 58ac578 commit 307b8e7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion EasyRTMP_FILE/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ using namespace std;
#define KEY "79397037795A4F576B597141776374627044512B4A664A6C59584E35636E52746346396D6157786C567778576F502B6C3430566863336C4559584A33615735555A57467453584E55614756435A584E30514449774D54686C59584E35"
#endif

char* SRTMP= "rtmp://www.easydss.com:10085/hls/streamxxx"; //Default RTMP Push StreamName
char* SRTMP= "rtmp://demo.easydss.com:10085/hls/streamxxx"; //Default RTMP Push StreamName
char* ProgName; //Program Name

/* EasyRTMP数据回调 */
Expand Down
8 changes: 4 additions & 4 deletions EasyRTMP_FILE/main_linux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

#ifdef _WIN32
#include "getopt.h"
#define KEY "6A34714D6C3469576B5A7541662F5257715174355875784659584E355548567A6147567958305A4A544555755A58686C56752B7141506A655A57467A65513D3D"
#define KEY "79397037795969576B5A73414538316270444C737065354659584E35556C524E55463947535578464C6D56345A56634D5671442F70654E4659584E355247467964326C755647566862556C7A5647686C516D567A644541794D4445345A57467A65513D3D"
#else
#include "unistd.h"
#include <signal.h>
#define KEY "6A34714D6C3469576B5A7541662F5257715174355876426C59584E356348567A6147567958325A706247565737366F412B4E356C59584E35"
#define KEY "7939703779662B2B72624B415A4D3562704447624A664A6C59584E35636E52746346396D6157786C567778576F502B6C3430566863336C4559584A33615735555A57467453584E55614756435A584E30514449774D54686C59584E35"
#endif

char* SRTMP= "rtmp://192.168.6.95/live/stream"; //Default RTMP Push StreamName
char* SRTMP= "rtmp://demo.easydss.com/hls/stream"; //Default RTMP Push StreamName
char* ProgName; //Program Name

int __EasyRTMP_Callback(int _frameType, char *pBuf, EASY_RTMP_STATE_T _state, void *_userPtr)
Expand Down Expand Up @@ -86,7 +86,7 @@ int main(int argc, char * argv[])
}
}

fES = fopen("./EasyPusher.264", "rb");
fES = fopen("./test.h264", "rb");
if (NULL == fES) return 0;

isActivated = EasyRTMP_Activate(KEY);
Expand Down
Binary file added EasyRTMP_FILE/test.h264
Binary file not shown.
2 changes: 1 addition & 1 deletion EasyRTMP_RTSP/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ int main(int argc, char * argv[])
int ch;

srand((unsigned)time(NULL));
sprintf(SRTMP,"rtmp://www.easydss.com:10085/hls/%d", rand()%99999999);
sprintf(SRTMP,"rtmp://demo.easydss.com:10085/hls/%d", rand()%99999999);

int iret = EasyRTMP_Activate(KEY);
if (iret != 0)
Expand Down

0 comments on commit 307b8e7

Please sign in to comment.