generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4

Browse Source 
* commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58':
  lavf: replace rename() with ff_rename()

Conflicts:
	libavformat/hdsenc.c
	libavformat/internal.h

See: 95d2fc6a76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-18 01:22:14 +01:00
parent 324797eb83 19fc283dbb
commit d3316c3f85
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/internal.h
View File

@@ -371,6 +371,20 @@ AVRational ff_choose_timebase(AVFormatContext *s, AVStream *st, int min_precisio
*/
int ff_generate_avci_extradata(AVStream *st);
/**
* Wrap errno on rename() error.
*
* @param oldpath source path
* @param newpath destination path
* @return 0 or AVERROR on failure
*/
static inline int ff_rename(const char *oldpath, const char *newpath)
{
if (rename(oldpath, newpath) == -1)
return AVERROR(errno);
return 0;
}
/**
* Allocate extradata with additional FF_INPUT_BUFFER_PADDING_SIZE at end
* which is always set to 0.