[FFmpeg-cvslog] rtmpproto: replace strtok_r by av_strtok its unavailable in mingw
Michael Niedermayer
git at videolan.org
Mon Jun 11 23:31:45 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 11 23:03:01 2012 +0200| [f91b635b520aec02cfd23ff91d00a7eb4ef89292] | committer: Michael Niedermayer
rtmpproto: replace strtok_r by av_strtok its unavailable in mingw
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f91b635b520aec02cfd23ff91d00a7eb4ef89292
---
libavformat/rtmpproto.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 9469ed3..6e53e9e 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -130,8 +130,8 @@ static int rtmp_write_amf_data(URLContext *s, char *param, uint8_t **p)
value = param + 2;
} else if (param[0] == 'N' && param[1] && param[2] == ':') {
type = param[1];
- field = strtok_r(param + 3, ":", &saveptr);
- value = strtok_r(NULL, ":", &saveptr);
+ field = av_strtok(param + 3, ":", &saveptr);
+ value = av_strtok(NULL, ":", &saveptr);
if (!field || !value)
goto fail;
@@ -229,7 +229,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
char *param, *saveptr;
// Write arbitrary AMF data to the Connect message.
- param = strtok_r(rt->conn, " ", &saveptr);
+ param = av_strtok(rt->conn, " ", &saveptr);
while (param != NULL) {
if ((ret = rtmp_write_amf_data(s, param, &p)) < 0) {
// Invalid AMF parameter.
@@ -237,7 +237,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
return ret;
}
- param = strtok_r(NULL, " ", &saveptr);
+ param = av_strtok(NULL, " ", &saveptr);
}
}
More information about the ffmpeg-cvslog
mailing list