Browse Source

avformat/avio: move ff_rename implementation from internal.h to avio.c

Signed-off-by: Marton Balint <cus@passwd.hu>
tags/n4.3
Marton Balint 5 years ago
parent
commit
df993269ec
2 changed files with 16 additions and 13 deletions
  1. +15
    -0
      libavformat/avio.c
  2. +1
    -13
      libavformat/internal.h

+ 15
- 0
libavformat/avio.c View File

@@ -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;
}

+ 1
- 13
libavformat/internal.h View File

@@ -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


Loading…
Cancel
Save