[FFmpeg-cvslog] Use avpriv_tempfile()
Michael Niedermayer
git at videolan.org
Sat Mar 12 02:26:52 CET 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Mar 9 15:28:28 2016 +0100| [9d4ab1380addb2a4e2863c625a63eed16009f90c] | committer: Michael Niedermayer
Use avpriv_tempfile()
Should fix xvid/cache on windows with --enable-shared
May be related to Ticket 4780
Tested-by: Hendrik Leppkes <h.leppkes at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d4ab1380addb2a4e2863c625a63eed16009f90c
---
libavcodec/libxvid.c | 2 +-
libavcodec/libxvid_rc.c | 4 ++--
libavformat/cache.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 6fd4e16..76e725e 100644
--- 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 0fd030c..0e25a07 100644
--- 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 1d26cb8..25b28d5 100644
--- 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;
More information about the ffmpeg-cvslog
mailing list