diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-09 15:28:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-12 02:08:45 +0100 |
| commit | 9d4ab1380addb2a4e2863c625a63eed16009f90c (patch) | |
| tree | 6ad7836220b2dba804361c98bfbc42cd8de2cb4b | |
| parent | b4f59beeb4c2171879d0d7607a4a7d6165f07791 (diff) | |
| download | ffmpeg-9d4ab1380addb2a4e2863c625a63eed16009f90c.tar.gz | |
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>
| -rw-r--r-- | libavcodec/libxvid.c | 2 | ||||
| -rw-r--r-- | libavcodec/libxvid_rc.c | 4 | ||||
| -rw-r--r-- | libavformat/cache.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 6fd4e162c1..76e725e883 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 0fd030c706..0e25a07502 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 1d26cb8e1e..25b28d585f 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; |