Use avpriv_tempfile()

Should fix xvid/cache on windows with --enable-shared

May be related to Ticket 4780

Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 6fd4e162c1f1b8fe71cbd74e6b6a9a09cc2a7d4c..76e725e883a7fb82dce5412f98622a1c1c645fca 100644 (file)
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -541,7 +541,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
         rc2pass2.version = XVID_VERSION;
         rc2pass2.bitrate = avctx->bit_rate;
 
-        fd = av_tempfile("xvidff.", &x->twopassfile, 0, avctx);
+        fd = avpriv_tempfile("xvidff.", &x->twopassfile, 0, avctx);
         if (fd < 0) {
             av_log(avctx, AV_LOG_ERROR, "Xvid: Cannot write 2-pass pipe\n");
             return fd;

diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c
index 0fd030c706ece6cc9a97e5785fc97a901d63cad0..0e25a07502a598c928ff44e651109ebab3da6e2e 100644 (file)
--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@@ -33,7 +33,7 @@
 #include <xvid.h>
 
 #include "libavutil/attributes.h"
-#include "libavutil/file.h"
+#include "libavutil/internal.h"
 
 #include "avcodec.h"
 #include "libxvid.h"
@@ -46,7 +46,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
     xvid_plg_create_t xvid_plg_create = { 0 };
     xvid_plugin_2pass2_t xvid_2pass2  = { 0 };
 
-    fd = av_tempfile("xvidrc.", &tmp_name, 0, s->avctx);
+    fd = avpriv_tempfile("xvidrc.", &tmp_name, 0, s->avctx);
     if (fd < 0) {
         av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
         return fd;

diff --git a/libavformat/cache.c b/libavformat/cache.c
index 1d26cb8e1ed36e5755fb3873904aaf0951df6753..25b28d585f9cb9548cf45662649623db897aaf18 100644 (file)
--- a/libavformat/cache.c
+++ b/libavformat/cache.c
@@ -29,7 +29,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
-#include "libavutil/file.h"
+#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/tree.h"
 #include "avformat.h"
@@ -77,7 +77,7 @@ static int cache_open(URLContext *h, const char *arg, int flags, AVDictionary **
 
     av_strstart(arg, "cache:", &arg);
 
-    c->fd = av_tempfile("ffcache", &buffername, 0, h);
+    c->fd = avpriv_tempfile("ffcache", &buffername, 0, h);
     if (c->fd < 0){
         av_log(h, AV_LOG_ERROR, "Failed to create tempfile\n");
         return c->fd;