har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename av_tempfile() to ff_tempfile()

Browse Source 
Originally committed as revision 24075 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-07-06 13:22:44 +00:00
parent 25cbc8b46e
commit a2ab5ad5f1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libxvid_internal.h
View File

@ -27,6 +27,6 @@
*/ */
int av_tempfile(char *prefix, char **filename); int ff_tempfile(char *prefix, char **filename);
#endif /* AVCODEC_LIBXVID_INTERNAL_H */ #endif /* AVCODEC_LIBXVID_INTERNAL_H */

2
libavcodec/libxvid_rc.c
View File

@ -40,7 +40,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
//xvid_debug=-1; //xvid_debug=-1;
fd=av_tempfile("xvidrc.", &tmp_name); fd=ff_tempfile("xvidrc.", &tmp_name);
if (fd == -1) { if (fd == -1) {
av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n"); av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
return -1; return -1;

4
libavcodec/libxvidff.c
View File

@ -235,7 +235,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
rc2pass2.version = XVID_VERSION; rc2pass2.version = XVID_VERSION;
rc2pass2.bitrate = avctx->bit_rate; rc2pass2.bitrate = avctx->bit_rate;
fd = av_tempfile("xvidff.", &(x->twopassfile)); fd = ff_tempfile("xvidff.", &(x->twopassfile));
if( fd == -1 ) { if( fd == -1 ) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Xvid: Cannot write 2-pass pipe\n"); "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. * *prefix can be a character constant; *filename will be allocated internally.
* @return file descriptor of opened file (or -1 on error) * @return file descriptor of opened file (or -1 on error)
* and opened file name in **filename. */ * and opened file name in **filename. */
int av_tempfile(char *prefix, char **filename) { int ff_tempfile(char *prefix, char **filename) {
int fd=-1; int fd=-1;
#if !HAVE_MKSTEMP #if !HAVE_MKSTEMP
*filename = tempnam(".", prefix); *filename = tempnam(".", prefix);