diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 9469ed3c8ed693b1b543723c348429057b4850aa..6e53e9e4a9b55e755d67c0469b6b810c15a2f8e1 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);
         }
     }