# HG changeset patch # User mru # Date 1278422564 0 # Node ID 95f57b61c9b37d9b8d016edbcb828a9f3cd8e785 # Parent e8a29b278ebfa57120fc728ee91c3544574a10bc Rename av_tempfile() to ff_tempfile() diff -r e8a29b278ebf -r 95f57b61c9b3 libxvid_internal.h --- a/libxvid_internal.h Tue Jul 06 13:04:21 2010 +0000 +++ b/libxvid_internal.h Tue Jul 06 13:22:44 2010 +0000 @@ -27,6 +27,6 @@ */ -int av_tempfile(char *prefix, char **filename); +int ff_tempfile(char *prefix, char **filename); #endif /* AVCODEC_LIBXVID_INTERNAL_H */ diff -r e8a29b278ebf -r 95f57b61c9b3 libxvid_rc.c --- a/libxvid_rc.c Tue Jul 06 13:04:21 2010 +0000 +++ b/libxvid_rc.c Tue Jul 06 13:22:44 2010 +0000 @@ -40,7 +40,7 @@ //xvid_debug=-1; - fd=av_tempfile("xvidrc.", &tmp_name); + fd=ff_tempfile("xvidrc.", &tmp_name); if (fd == -1) { av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n"); return -1; diff -r e8a29b278ebf -r 95f57b61c9b3 libxvidff.c --- a/libxvidff.c Tue Jul 06 13:04:21 2010 +0000 +++ b/libxvidff.c Tue Jul 06 13:22:44 2010 +0000 @@ -235,7 +235,7 @@ rc2pass2.version = XVID_VERSION; rc2pass2.bitrate = avctx->bit_rate; - fd = av_tempfile("xvidff.", &(x->twopassfile)); + fd = ff_tempfile("xvidff.", &(x->twopassfile)); if( fd == -1 ) { av_log(avctx, AV_LOG_ERROR, "Xvid: Cannot write 2-pass pipe\n"); @@ -775,7 +775,7 @@ * *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 ff_tempfile(char *prefix, char **filename) { int fd=-1; #if !HAVE_MKSTEMP *filename = tempnam(".", prefix);