Index: avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.457
diff -u -r1.457 avcodec.h
--- avcodec.h	10 Mar 2006 13:55:48 -0000	1.457
+++ avcodec.h	20 Mar 2006 04:18:27 -0000
@@ -2594,6 +2594,8 @@
 
 extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 
+int av_tempfile(char *prefix, char **filename);
+
 #ifdef __cplusplus
 }
 #endif
Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
retrieving revision 1.178
diff -u -r1.178 utils.c
--- utils.c	6 Mar 2006 15:09:04 -0000	1.178
+++ utils.c	20 Mar 2006 04:18:28 -0000
@@ -1349,3 +1349,39 @@
     n++;
     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.
+ * Returns 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;
+#ifdef CONFIG_WIN32
+    *filename = tempnam(".", *prefix);
+#else
+    size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */
+    *filename = av_malloc(len * sizeof(char));
+#endif
+    /* -----common section-----*/
+    if (*filename == NULL) {
+        av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n");
+        return -1;
+    }
+#ifdef CONFIG_WIN32
+    fd = open(*filename, _O_RDWR | _O_BINARY);
+#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\n");
+        return -1;
+    }
+    return fd; /* success */
+}
Index: xvid_rc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/xvid_rc.c,v
retrieving revision 1.3
diff -u -r1.3 xvid_rc.c
--- xvid_rc.c	19 Mar 2006 11:49:37 -0000	1.3
+++ xvid_rc.c	20 Mar 2006 04:18:28 -0000
@@ -37,11 +37,10 @@
 
 //xvid_debug=-1;
 
-    tmp_name= av_strdup("/tmp/xvidrc.XXXXXX");
-    fd = mkstemp(tmp_name);
-    if(fd < 0){
-        strcpy(tmp_name, "./xvidrc.XXXXXX");
-        fd = mkstemp(tmp_name);
+    fd=av_tempfile("xvidrc.", &tmp_name);
+    if (fd == -1) {
+        av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
+        return -1;
     }
 
     for(i=0; i<s->rc_context.num_entries; i++){
Index: xvidff.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/xvidff.c,v
retrieving revision 1.8
diff -u -r1.8 xvidff.c
--- xvidff.c	18 Mar 2006 02:46:39 -0000	1.8
+++ xvidff.c	20 Mar 2006 04:18:28 -0000
@@ -229,39 +229,7 @@
         rc2pass2.version = XVID_VERSION;
         rc2pass2.bitrate = avctx->bit_rate;
 
-#ifdef CONFIG_WIN32 /* Ugly work around */
-        {
-           char *tempname;
-
-           tempname = tempnam(".", "xvidff");
-            fd = -1;
-            if( tempname &&
-                (fd = open(tempname, _O_RDWR | _O_BINARY)) != -1 ) {
-                x->twopassfile = av_strdup(tempname);
-#undef free
-                free(tempname);
-#define free please_use_av_free
-                if( x->twopassfile == NULL ) {
-                    av_log(avctx, AV_LOG_ERROR,
-                        "XviD: Cannot allocate 2-pass buffer\n");
-                    return -1;
-                }
-            }
-       }
-#else
-        x->twopassfile = av_malloc(BUFFER_SIZE);
-        if( x->twopassfile == NULL ) {
-            av_log(avctx, AV_LOG_ERROR,
-                "XviD: Cannot allocate 2-pass buffer\n");
-            return -1;
-        }
-        strcpy(x->twopassfile, "/tmp/xvidff.XXXXXX");
-        fd = mkstemp(x->twopassfile);
-        if(fd < 0){
-            strcpy(x->twopassfile, "./xvidff.XXXXXX");
-            fd = mkstemp(x->twopassfile);
-        }
-#endif
+        fd = av_tempfile("xvidff.", &(x->twopassfile));
         if( fd == -1 ) {
             av_log(avctx, AV_LOG_ERROR,
                 "XviD: Cannot write 2-pass pipe\n");