diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-07-06 13:22:44 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-07-06 13:22:44 +0000 |
| commit | a2ab5ad5f15fc65b41d653f2b8a9606d45fad919 (patch) | |
| tree | f8c3622b208b029e38a883a60675ea485a163c51 | |
| parent | 25cbc8b46e1d4d17c4725b52bcb5cec4d832f894 (diff) | |
| download | ffmpeg-a2ab5ad5f15fc65b41d653f2b8a9606d45fad919.tar.gz | |
Rename av_tempfile() to ff_tempfile()
Originally committed as revision 24075 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/libxvid_internal.h | 2 | ||||
| -rw-r--r-- | libavcodec/libxvid_rc.c | 2 | ||||
| -rw-r--r-- | libavcodec/libxvidff.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/libxvid_internal.h b/libavcodec/libxvid_internal.h index ffa5cf8d2c..2614f5b5ea 100644 --- a/libavcodec/libxvid_internal.h +++ b/libavcodec/libxvid_internal.h @@ -27,6 +27,6 @@ */ -int av_tempfile(char *prefix, char **filename); +int ff_tempfile(char *prefix, char **filename); #endif /* AVCODEC_LIBXVID_INTERNAL_H */ diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c index c161ba7101..08e89c8df1 100644 --- a/libavcodec/libxvid_rc.c +++ b/libavcodec/libxvid_rc.c @@ -40,7 +40,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){ //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 --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index 131453820b..e37b900c1d 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -235,7 +235,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { 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 @@ int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2) { * *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); |