Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
74dbb538
Commit
74dbb538
authored
Oct 16, 2011
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
av_tempfile: Pass int log_offset, void *log_ctx
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
482aabd5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
7 deletions
+8
-7
libxvid_rc.c
libavcodec/libxvid_rc.c
+1
-1
libxvidff.c
libavcodec/libxvidff.c
+1
-1
cache.c
libavformat/cache.c
+1
-1
file.c
libavutil/file.c
+4
-3
file.h
libavutil/file.h
+1
-1
No files found.
libavcodec/libxvid_rc.c
View file @
74dbb538
...
@@ -41,7 +41,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
...
@@ -41,7 +41,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
//xvid_debug=-1;
//xvid_debug=-1;
fd
=
av_tempfile
(
"xvidrc."
,
&
tmp_name
);
fd
=
av_tempfile
(
"xvidrc."
,
&
tmp_name
,
0
,
s
->
avctx
);
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
;
...
...
libavcodec/libxvidff.c
View file @
74dbb538
...
@@ -232,7 +232,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
...
@@ -232,7 +232,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
=
av_tempfile
(
"xvidff."
,
&
(
x
->
twopassfile
)
,
0
,
avctx
);
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
"
);
...
...
libavformat/cache.c
View file @
74dbb538
...
@@ -63,7 +63,7 @@ static int cache_open(URLContext *h, const char *arg, int flags)
...
@@ -63,7 +63,7 @@ static int cache_open(URLContext *h, const char *arg, int flags)
av_strstart
(
arg
,
"cache:"
,
&
arg
);
av_strstart
(
arg
,
"cache:"
,
&
arg
);
c
->
fd
=
av_tempfile
(
"ffcache"
,
&
buffername
);
c
->
fd
=
av_tempfile
(
"ffcache"
,
&
buffername
,
0
,
h
);
if
(
c
->
fd
<
0
){
if
(
c
->
fd
<
0
){
av_log
(
h
,
AV_LOG_ERROR
,
"Failed to create tempfile
\n
"
);
av_log
(
h
,
AV_LOG_ERROR
,
"Failed to create tempfile
\n
"
);
return
c
->
fd
;
return
c
->
fd
;
...
...
libavutil/file.c
View file @
74dbb538
...
@@ -130,7 +130,8 @@ void av_file_unmap(uint8_t *bufptr, size_t size)
...
@@ -130,7 +130,8 @@ void av_file_unmap(uint8_t *bufptr, size_t size)
#endif
#endif
}
}
int
av_tempfile
(
const
char
*
prefix
,
char
**
filename
)
{
int
av_tempfile
(
const
char
*
prefix
,
char
**
filename
,
int
log_offset
,
void
*
log_ctx
)
{
FileLogContext
file_log_ctx
=
{
&
file_log_ctx_class
,
log_offset
,
log_ctx
};
int
fd
=-
1
;
int
fd
=-
1
;
#if !HAVE_MKSTEMP
#if !HAVE_MKSTEMP
void
*
ptr
=
tempnam
(
NULL
,
prefix
);
void
*
ptr
=
tempnam
(
NULL
,
prefix
);
...
@@ -145,7 +146,7 @@ int av_tempfile(const char *prefix, char **filename) {
...
@@ -145,7 +146,7 @@ int av_tempfile(const char *prefix, char **filename) {
#endif
#endif
/* -----common section-----*/
/* -----common section-----*/
if
(
*
filename
==
NULL
)
{
if
(
*
filename
==
NULL
)
{
av_log
(
NULL
,
AV_LOG_ERROR
,
"ff_tempfile: Cannot allocate file name
\n
"
);
av_log
(
&
file_log_ctx
,
AV_LOG_ERROR
,
"ff_tempfile: Cannot allocate file name
\n
"
);
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
}
}
#if !HAVE_MKSTEMP
#if !HAVE_MKSTEMP
...
@@ -167,7 +168,7 @@ int av_tempfile(const char *prefix, char **filename) {
...
@@ -167,7 +168,7 @@ int av_tempfile(const char *prefix, char **filename) {
/* -----common section-----*/
/* -----common section-----*/
if
(
fd
<
0
)
{
if
(
fd
<
0
)
{
int
err
=
AVERROR
(
errno
);
int
err
=
AVERROR
(
errno
);
av_log
(
NULL
,
AV_LOG_ERROR
,
"ff_tempfile: Cannot open temporary file %s
\n
"
,
*
filename
);
av_log
(
&
file_log_ctx
,
AV_LOG_ERROR
,
"ff_tempfile: Cannot open temporary file %s
\n
"
,
*
filename
);
return
err
;
return
err
;
}
}
return
fd
;
/* success */
return
fd
;
/* success */
...
...
libavutil/file.h
View file @
74dbb538
...
@@ -56,6 +56,6 @@ void av_file_unmap(uint8_t *bufptr, size_t size);
...
@@ -56,6 +56,6 @@ void av_file_unmap(uint8_t *bufptr, size_t size);
* @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
(
const
char
*
prefix
,
char
**
filename
);
int
av_tempfile
(
const
char
*
prefix
,
char
**
filename
,
int
log_offset
,
void
*
log_ctx
);
#endif
/* AVUTIL_FILE_H */
#endif
/* AVUTIL_FILE_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment