diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-16 21:32:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-16 21:51:28 +0200 |
| commit | 74dbb5388e356c085b2f426a5533c08cdc163488 (patch) | |
| tree | b93f0769155db5cfa26f622428a50e8eac9ab38c /libavutil | |
| parent | 482aabd59a9da807e88fc7796b0764290b62cf11 (diff) | |
av_tempfile: Pass int log_offset, void *log_ctx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/file.c | 7 | ||||
| -rw-r--r-- | libavutil/file.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libavutil/file.c b/libavutil/file.c index e2cfc2f1dd..882a9855ef 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -130,7 +130,8 @@ void av_file_unmap(uint8_t *bufptr, size_t size) #endif } -int av_tempfile(const char *prefix, char **filename) { +int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx) { + FileLogContext file_log_ctx = { &file_log_ctx_class, log_offset, log_ctx }; int fd=-1; #if !HAVE_MKSTEMP void *ptr= tempnam(NULL, prefix); @@ -145,7 +146,7 @@ int av_tempfile(const char *prefix, char **filename) { #endif /* -----common section-----*/ if (*filename == NULL) { - av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n"); + av_log(&file_log_ctx, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n"); return AVERROR(ENOMEM); } #if !HAVE_MKSTEMP @@ -167,7 +168,7 @@ int av_tempfile(const char *prefix, char **filename) { /* -----common section-----*/ if (fd < 0) { int err = AVERROR(errno); - av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot open temporary file %s\n", *filename); + av_log(&file_log_ctx, AV_LOG_ERROR, "ff_tempfile: Cannot open temporary file %s\n", *filename); return err; } return fd; /* success */ diff --git a/libavutil/file.h b/libavutil/file.h index c6d2692d52..f3af9ef7e5 100644 --- a/libavutil/file.h +++ b/libavutil/file.h @@ -56,6 +56,6 @@ void av_file_unmap(uint8_t *bufptr, size_t size); * @return file descriptor of opened file (or -1 on error) * and opened file name in **filename. */ -int av_tempfile(const char *prefix, char **filename); +int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx); #endif /* AVUTIL_FILE_H */ |