diff options
| author | Marton Balint <cus@passwd.hu> | 2020-01-08 23:50:41 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-01-19 22:17:04 +0100 |
| commit | df993269ecb970502a0ecdbe21f35e376fc9194c (patch) | |
| tree | 0e4a1e19835dd6f06271ed198bddae0958e6c0bb | |
| parent | 15133c6ab2a3f725945212a2dc0a11fc45d25d3b (diff) | |
| download | ffmpeg-df993269ecb970502a0ecdbe21f35e376fc9194c.tar.gz | |
avformat/avio: move ff_rename implementation from internal.h to avio.c
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavformat/avio.c | 15 | ||||
| -rw-r--r-- | libavformat/internal.h | 14 |
2 files changed, 16 insertions, 13 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 2dd2312296..8c2c85f171 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -26,6 +26,7 @@ #include "libavutil/avassert.h" #include "os_support.h" #include "avformat.h" +#include "internal.h" #if CONFIG_NETWORK #include "network.h" #endif @@ -665,3 +666,17 @@ int ff_check_interrupt(AVIOInterruptCB *cb) return cb->callback(cb->opaque); return 0; } + +int ff_rename(const char *oldpath, const char *newpath, void *logctx) +{ + int ret = 0; + if (rename(oldpath, newpath) == -1) { + ret = AVERROR(errno); + 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; +} diff --git a/libavformat/internal.h b/libavformat/internal.h index ec9a29907a..da09983083 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -586,19 +586,7 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src); * @param newpath destination path * @return 0 or AVERROR on failure */ -static inline int ff_rename(const char *oldpath, const char *newpath, void *logctx) -{ - int ret = 0; - if (rename(oldpath, newpath) == -1) { - ret = AVERROR(errno); - 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; -} +int ff_rename(const char *oldpath, const char *newpath, void *logctx); /** * Allocate extradata with additional AV_INPUT_BUFFER_PADDING_SIZE at end |