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
df993269
Commit
df993269
authored
Jan 08, 2020
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/avio: move ff_rename implementation from internal.h to avio.c
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
15133c6a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
13 deletions
+16
-13
avio.c
libavformat/avio.c
+15
-0
internal.h
libavformat/internal.h
+1
-13
No files found.
libavformat/avio.c
View file @
df993269
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
#include "libavutil/avassert.h"
#include "libavutil/avassert.h"
#include "os_support.h"
#include "os_support.h"
#include "avformat.h"
#include "avformat.h"
#include "internal.h"
#if CONFIG_NETWORK
#if CONFIG_NETWORK
#include "network.h"
#include "network.h"
#endif
#endif
...
@@ -665,3 +666,17 @@ int ff_check_interrupt(AVIOInterruptCB *cb)
...
@@ -665,3 +666,17 @@ int ff_check_interrupt(AVIOInterruptCB *cb)
return
cb
->
callback
(
cb
->
opaque
);
return
cb
->
callback
(
cb
->
opaque
);
return
0
;
return
0
;
}
}
int
ff_rename
(
const
char
*
oldpath
,
const
char
*
newpath
,
void
*
logctx
)
{
int
ret
=
0
;
if
(
rename
(
oldpath
,
newpath
)
==
-
1
)
{
ret
=
AVERROR
(
errno
);
if
(
logctx
)
{
char
err
[
AV_ERROR_MAX_STRING_SIZE
]
=
{
0
};
av_make_error_string
(
err
,
AV_ERROR_MAX_STRING_SIZE
,
ret
);
av_log
(
logctx
,
AV_LOG_ERROR
,
"failed to rename file %s to %s: %s
\n
"
,
oldpath
,
newpath
,
err
);
}
}
return
ret
;
}
libavformat/internal.h
View file @
df993269
...
@@ -586,19 +586,7 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src);
...
@@ -586,19 +586,7 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src);
* @param newpath destination path
* @param newpath destination path
* @return 0 or AVERROR on failure
* @return 0 or AVERROR on failure
*/
*/
static
inline
int
ff_rename
(
const
char
*
oldpath
,
const
char
*
newpath
,
void
*
logctx
)
int
ff_rename
(
const
char
*
oldpath
,
const
char
*
newpath
,
void
*
logctx
);
{
int
ret
=
0
;
if
(
rename
(
oldpath
,
newpath
)
==
-
1
)
{
ret
=
AVERROR
(
errno
);
if
(
logctx
)
{
char
err
[
AV_ERROR_MAX_STRING_SIZE
]
=
{
0
};
av_make_error_string
(
err
,
AV_ERROR_MAX_STRING_SIZE
,
ret
);
av_log
(
logctx
,
AV_LOG_ERROR
,
"failed to rename file %s to %s: %s
\n
"
,
oldpath
,
newpath
,
err
);
}
}
return
ret
;
}
/**
/**
* Allocate extradata with additional AV_INPUT_BUFFER_PADDING_SIZE at end
* Allocate extradata with additional AV_INPUT_BUFFER_PADDING_SIZE at end
...
...
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