[FFmpeg-cvslog] r24075 - in trunk/libavcodec: libxvid_internal.h libxvid_rc.c libxvidff.c

[mru]

Author: mru
Date: Tue Jul  6 15:22:44 2010
New Revision: 24075

Log:
Rename av_tempfile() to ff_tempfile()

Modified:
   trunk/libavcodec/libxvid_internal.h
   trunk/libavcodec/libxvid_rc.c
   trunk/libavcodec/libxvidff.c

Modified: trunk/libavcodec/libxvid_internal.h
==============================================================================
--- trunk/libavcodec/libxvid_internal.h	Tue Jul  6 15:04:21 2010	(r24074)
+++ trunk/libavcodec/libxvid_internal.h	Tue Jul  6 15:22:44 2010	(r24075)
@@ -27,6 +27,6 @@
  */
 
 
-int av_tempfile(char *prefix, char **filename);
+int ff_tempfile(char *prefix, char **filename);
 
 #endif /* AVCODEC_LIBXVID_INTERNAL_H */

Modified: trunk/libavcodec/libxvid_rc.c
==============================================================================
--- trunk/libavcodec/libxvid_rc.c	Tue Jul  6 15:04:21 2010	(r24074)
+++ trunk/libavcodec/libxvid_rc.c	Tue Jul  6 15:22:44 2010	(r24075)
@@ -40,7 +40,7 @@ int ff_xvid_rate_control_init(MpegEncCon
 
 //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;

Modified: trunk/libavcodec/libxvidff.c
==============================================================================
--- trunk/libavcodec/libxvidff.c	Tue Jul  6 15:04:21 2010	(r24074)
+++ trunk/libavcodec/libxvidff.c	Tue Jul  6 15:22:44 2010	(r24075)
@@ -235,7 +235,7 @@ static av_cold int xvid_encode_init(AVCo
         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, vo
  * *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);