1 files changed, 10 insertions, 10 deletions

diff --git a/chromium/third_party/ffmpeg/tools/zmqsend.c b/chromium/third_party/ffmpeg/tools/zmqsend.c
index ae3c8d7aa40..d47bf216b47 100644
--- a/chromium/third_party/ffmpeg/tools/zmqsend.c
+++ b/chromium/third_party/ffmpeg/tools/zmqsend.c
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
     AVBPrint src;
     char c, *src_buf, *recv_buf;
     int recv_buf_size, ret;
-    void *ctx, *socket;
+    void *zmq_ctx, *socket;
     const char *bind_address = "tcp://localhost:5555";
     const char *infilename = NULL;
     FILE *infile = NULL;
@@ -88,23 +88,23 @@ int main(int argc, char **argv)
         return 1;
     }
 
-    ctx = zmq_ctx_new();
-    if (!ctx) {
+    zmq_ctx = zmq_ctx_new();
+    if (!zmq_ctx) {
         av_log(NULL, AV_LOG_ERROR,
                "Could not create ZMQ context: %s\n", zmq_strerror(errno));
         return 1;
     }
 
-    socket = zmq_socket(ctx, ZMQ_REQ);
+    socket = zmq_socket(zmq_ctx, ZMQ_REQ);
     if (!socket) {
-        av_log(ctx, AV_LOG_ERROR,
+        av_log(NULL, AV_LOG_ERROR,
                "Could not create ZMQ socket: %s\n", zmq_strerror(errno));
         ret = 1;
         goto end;
     }
 
     if (zmq_connect(socket, bind_address) == -1) {
-        av_log(ctx, AV_LOG_ERROR, "Could not bind ZMQ responder to address '%s': %s\n",
+        av_log(NULL, AV_LOG_ERROR, "Could not bind ZMQ responder to address '%s': %s\n",
                bind_address, zmq_strerror(errno));
         ret = 1;
         goto end;
@@ -131,14 +131,14 @@ int main(int argc, char **argv)
     }
 
     if (zmq_msg_init(&msg) == -1) {
-        av_log(ctx, AV_LOG_ERROR,
+        av_log(NULL, AV_LOG_ERROR,
                "Could not initialize receiving message: %s\n", zmq_strerror(errno));
         ret = 1;
         goto end;
     }
 
     if (zmq_msg_recv(&msg, socket, 0) == -1) {
-        av_log(ctx, AV_LOG_ERROR,
+        av_log(NULL, AV_LOG_ERROR,
                "Could not receive message: %s\n", zmq_strerror(errno));
         zmq_msg_close(&msg);
         ret = 1;
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
     recv_buf_size = zmq_msg_size(&msg) + 1;
     recv_buf = av_malloc(recv_buf_size);
     if (!recv_buf) {
-        av_log(ctx, AV_LOG_ERROR,
+        av_log(NULL, AV_LOG_ERROR,
                "Could not allocate receiving message buffer\n");
         zmq_msg_close(&msg);
         ret = 1;
@@ -162,6 +162,6 @@ int main(int argc, char **argv)
 
 end:
     zmq_close(socket);
-    zmq_ctx_destroy(ctx);
+    zmq_ctx_destroy(zmq_ctx);
     return ret;
 }