Created
July 18, 2012 20:11
-
-
Save j0sh/3138559 to your computer and use it in GitHub Desktop.
ffrtmp: Work with rtmpd.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c | |
| index b48274b..72e1dcf 100644 | |
| --- a/libavformat/rtmpproto.c | |
| +++ b/libavformat/rtmpproto.c | |
| @@ -879,17 +879,18 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt) | |
| if (!ff_amf_get_field_value(pkt->data + 9, data_end, | |
| "description", tmpstr, sizeof(tmpstr))) | |
| av_log(s, AV_LOG_ERROR, "Server error: %s\n",tmpstr); | |
| - return -1; | |
| + return 1; | |
| } else if (!memcmp(pkt->data, "\002\000\007_result", 10)) { | |
| switch (rt->state) { | |
| case STATE_HANDSHAKED: | |
| if (!rt->is_input) { | |
| - if ((ret = gen_release_stream(s, rt)) < 0) | |
| + /*if ((ret = gen_release_stream(s, rt)) < 0) | |
| return ret; | |
| if ((ret = gen_fcpublish_stream(s, rt)) < 0) | |
| return ret; | |
| rt->state = STATE_RELEASING; | |
| } else { | |
| + */ | |
| if ((ret = gen_server_bw(s, rt)) < 0) | |
| return ret; | |
| rt->state = STATE_CONNECTING; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment