[FFmpeg-cvslog] avformat/internal: fix compile error with some versions of g++

Aman Gupta git at videolan.org
Sat Dec 23 22:37:52 EET 2017


ffmpeg | branch: master | Aman Gupta <aman at tmm1.net> | Sat Dec 23 12:34:50 2017 -0800| [9e5e3236f4f2004a505533228cf6a6dd65b0101c] | committer: Aman Gupta

avformat/internal: fix compile error with some versions of g++

Fixes #6926

Signed-off-by: Aman Gupta <aman at tmm1.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e5e3236f4f2004a505533228cf6a6dd65b0101c
---

 libavformat/internal.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/internal.h b/libavformat/internal.h
index de4b784634..e76ac12371 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -541,8 +541,11 @@ static inline int ff_rename(const char *oldpath, const char *newpath, void *logc
     int ret = 0;
     if (rename(oldpath, newpath) == -1) {
         ret = AVERROR(errno);
-        if (logctx)
-            av_log(logctx, AV_LOG_ERROR, "failed to rename file %s to %s: %s\n", oldpath, newpath, av_err2str(ret));
+        if (logctx) {
+            char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+            av_make_error_string(err, AV_ERROR_MAX_STRING_SIZE, ret);
+            av_log(logctx, AV_LOG_ERROR, "failed to rename file %s to %s: %s\n", oldpath, newpath, err);
+        }
     }
     return ret;
 }



More information about the ffmpeg-cvslog mailing list