diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 21:45:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 21:45:39 +0200 |
| commit | 9c41b59423bbb86685c05bcf3ef9d4a7efb54f34 (patch) | |
| tree | 1af9635e45836c894309762f84c93ed4d29615de /libavutil | |
| parent | ffa90d99fd8933b17917045a3768bb9dcfb56f72 (diff) | |
| parent | 0a024268261d05ccdcf7e03c85fb78d22037a464 (diff) | |
| download | ffmpeg-9c41b59423bbb86685c05bcf3ef9d4a7efb54f34.tar.gz | |
Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'
* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
libxvid: K&R formatting cosmetics
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/file.c b/libavutil/file.c index 5e0dc7ab68..359d290e99 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -137,9 +137,10 @@ void av_file_unmap(uint8_t *bufptr, size_t size) #endif } -int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx) { +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 void *ptr= tempnam(NULL, prefix); if(!ptr) @@ -149,7 +150,7 @@ int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_c free(ptr); #else size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */ - *filename = av_malloc(len); + *filename = av_malloc(len); #endif /* -----common section-----*/ if (!*filename) { |