har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

av_tempfile: Pass int log_offset, void *log_ctx

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-10-16 21:32:06 +02:00
parent 482aabd59a
commit 74dbb5388e
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libxvid_rc.c
View File

@ -41,7 +41,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
//xvid_debug=-1; //xvid_debug=-1;
fd=av_tempfile("xvidrc.", &tmp_name); fd=av_tempfile("xvidrc.", &tmp_name, 0, s->avctx);
if (fd == -1) { if (fd == -1) {
av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n"); av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
return -1; return -1;

2
libavcodec/libxvidff.c
View File

@ -232,7 +232,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
rc2pass2.version = XVID_VERSION; rc2pass2.version = XVID_VERSION;
rc2pass2.bitrate = avctx->bit_rate; rc2pass2.bitrate = avctx->bit_rate;
fd = av_tempfile("xvidff.", &(x->twopassfile)); fd = av_tempfile("xvidff.", &(x->twopassfile), 0, avctx);
if( fd == -1 ) { if( fd == -1 ) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Xvid: Cannot write 2-pass pipe\n"); "Xvid: Cannot write 2-pass pipe\n");

2
libavformat/cache.c
View File

@ -63,7 +63,7 @@ static int cache_open(URLContext *h, const char *arg, int flags)
av_strstart(arg, "cache:", &arg); av_strstart(arg, "cache:", &arg);
c->fd = av_tempfile("ffcache", &buffername); c->fd = av_tempfile("ffcache", &buffername, 0, h);
if (c->fd < 0){ if (c->fd < 0){
av_log(h, AV_LOG_ERROR, "Failed to create tempfile\n"); av_log(h, AV_LOG_ERROR, "Failed to create tempfile\n");
return c->fd; return c->fd;

7
libavutil/file.c
View File

@ -130,7 +130,8 @@ void av_file_unmap(uint8_t *bufptr, size_t size)
#endif #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; int fd=-1;
#if !HAVE_MKSTEMP #if !HAVE_MKSTEMP
void *ptr= tempnam(NULL, prefix); void *ptr= tempnam(NULL, prefix);
@ -145,7 +146,7 @@ int av_tempfile(const char *prefix, char **filename) {
#endif #endif
/* -----common section-----*/ /* -----common section-----*/
if (*filename == NULL) { 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); return AVERROR(ENOMEM);
} }
#if !HAVE_MKSTEMP #if !HAVE_MKSTEMP
@ -167,7 +168,7 @@ int av_tempfile(const char *prefix, char **filename) {
/* -----common section-----*/ /* -----common section-----*/
if (fd < 0) { if (fd < 0) {
int err = AVERROR(errno); 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 err;
} }
return fd; /* success */ return fd; /* success */

2
libavutil/file.h
View File

@ -56,6 +56,6 @@ void av_file_unmap(uint8_t *bufptr, size_t size);
* @return file descriptor of opened file (or -1 on error) * @return file descriptor of opened file (or -1 on error)
* and opened file name in **filename. * 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 */ #endif /* AVUTIL_FILE_H */