Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / cutils.c

diff --git a/libavformat/cutils.c b/libavformat/cutils.c
index 22be2c33846277dabf1dccd4ebd77dbcbec3dada..0458a2dc7c6c1293afc24d63d04c941df3ce1a6b 100644 (file)
--- a/libavformat/cutils.c
+++ b/libavformat/cutils.c
@@ -26,7 +26,7 @@
 
 /* This is our own gmtime_r. It differs from its POSIX counterpart in a
    couple of places, though. */
-struct tm *brktimegm(time_t secs, struct tm *tm)
+struct tm *ff_brktimegm(time_t secs, struct tm *tm)
 {
     int days, y, ny, m;
     int md[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };