diff options
author | Måns Rullgård <mans@mansr.com> | 2010-07-06 17:04:21 +0400 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2010-07-06 17:04:21 +0400 |
commit | 25cbc8b46e1d4d17c4725b52bcb5cec4d832f894 (patch) | |
tree | 22145354c7d002d1ced435f1423a231500403ebe /libavcodec/utils.c | |
parent | d0b9b91b57a8baf87f87d0388497afe66b050973 (diff) |
Move av_tempfile() to libxvidff.c as only the xvid wrapper needs it
Originally committed as revision 24074 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a8ed6d743a..902951137c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -25,9 +25,6 @@ * utils. */ -/* needed for mkstemp() */ -#define _XOPEN_SOURCE 600 - #include "libavutil/avstring.h" #include "libavutil/integer.h" #include "libavutil/crc.h" @@ -37,15 +34,11 @@ #include "opt.h" #include "imgconvert.h" #include "audioconvert.h" -#include "libxvid_internal.h" #include "internal.h" #include <stdlib.h> #include <stdarg.h> #include <limits.h> #include <float.h> -#if !HAVE_MKSTEMP -#include <fcntl.h> -#endif static int volatile entangled_thread_counter=0; int (*ff_lockmgr_cb)(void **mutex, enum AVLockOp op); @@ -1072,42 +1065,6 @@ unsigned int av_xiphlacing(unsigned char *s, unsigned int v) return n; } -/* Wrapper to work around the lack of mkstemp() on mingw/cygin. - * Also, tries to create file in /tmp first, if possible. - * *prefix can be a character constant; *filename will be allocated internally. - * @return file descriptor of opened file (or -1 on error) - * and opened file name in **filename. */ -int av_tempfile(char *prefix, char **filename) { - int fd=-1; -#if !HAVE_MKSTEMP - *filename = tempnam(".", prefix); -#else - size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */ - *filename = av_malloc(len); -#endif - /* -----common section-----*/ - if (*filename == NULL) { - av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n"); - return -1; - } -#if !HAVE_MKSTEMP - fd = open(*filename, O_RDWR | O_BINARY | O_CREAT, 0444); -#else - snprintf(*filename, len, "/tmp/%sXXXXXX", prefix); - fd = mkstemp(*filename); - if (fd < 0) { - snprintf(*filename, len, "./%sXXXXXX", prefix); - fd = mkstemp(*filename); - } -#endif - /* -----common section-----*/ - if (fd < 0) { - av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot open temporary file %s\n", *filename); - return -1; - } - return fd; /* success */ -} - typedef struct { const char *abbr; int width, height; |