virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

avutil/file: allow mapping 0 byte files with av_file_map

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2018-09-06 20:46:16 +02:00
parent bd3c27fd7a
commit 4737387d28
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/file.c
View File

@ -85,6 +85,11 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
} }
*size = off_size; *size = off_size;
if (!*size) {
*bufptr = NULL;
goto out;
}
#if HAVE_MMAP #if HAVE_MMAP
ptr = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); ptr = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
if (ptr == MAP_FAILED) { if (ptr == MAP_FAILED) {
@ -126,12 +131,15 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
read(fd, *bufptr, *size); read(fd, *bufptr, *size);
#endif #endif
out:
close(fd); close(fd);
return 0; return 0;
} }
void av_file_unmap(uint8_t *bufptr, size_t size) void av_file_unmap(uint8_t *bufptr, size_t size)
{ {
if (!size)
return;
#if HAVE_MMAP #if HAVE_MMAP
munmap(bufptr, size); munmap(bufptr, size);
#elif HAVE_MAPVIEWOFFILE #elif HAVE_MAPVIEWOFFILE

2
libavutil/file.h
View File

@ -33,6 +33,8 @@
* allocated buffer or map it with mmap() when available. * allocated buffer or map it with mmap() when available.
* In case of success set *bufptr to the read or mmapped buffer, and * In case of success set *bufptr to the read or mmapped buffer, and
* *size to the size in bytes of the buffer in *bufptr. * *size to the size in bytes of the buffer in *bufptr.
* Unlike mmap this function succeeds with zero sized files, in this
* case *bufptr will be set to NULL and *size will be set to 0.
* The returned buffer must be released with av_file_unmap(). * The returned buffer must be released with av_file_unmap().
* *
* @param log_offset loglevel offset used for logging * @param log_offset loglevel offset used for logging

2
libavutil/version.h
View File

@ -80,7 +80,7 @@
#define LIBAVUTIL_VERSION_MAJOR 56 #define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 19 #define LIBAVUTIL_VERSION_MINOR 19
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \