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

avio: add a destructor for AVIOContext

Browse Source 
Before this commit, AVIOContext is to be freed with a plain av_free(),
which prevents us from adding any deeper structure to it.

(cherry picked from commit 99684f3ae7)
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov
2017-08-27 13:26:58 -03:00
committed by James Almer
parent 837580f458
commit b12e4d3bb8
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@@ -15,6 +15,9 @@ libavutil: 2015-08-28
API changes, most recent first: API changes, most recent first:
2017-09-01 - xxxxxxx - lavf 57.80.100 / 57.11.0 - avio.h
Add avio_context_free(). From now on it must be used for freeing AVIOContext.
2017-08-08 - xxxxxxx - lavu 55.74.100 - pixdesc.h 2017-08-08 - xxxxxxx - lavu 55.74.100 - pixdesc.h
Add AV_PIX_FMT_FLAG_FLOAT pixel format flag. Add AV_PIX_FMT_FLAG_FLOAT pixel format flag.

8
libavformat/avio.h
View File

@@ -467,6 +467,14 @@ AVIOContext *avio_alloc_context(
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
int64_t (*seek)(void *opaque, int64_t offset, int whence)); int64_t (*seek)(void *opaque, int64_t offset, int whence));
/**
* Free the supplied IO context and everything associated with it.
*
* @param s Double pointer to the IO context. This function will write NULL
* into s.
*/
void avio_context_free(AVIOContext **s);
void avio_w8(AVIOContext *s, int b); void avio_w8(AVIOContext *s, int b);
void avio_write(AVIOContext *s, const unsigned char *buf, int size); void avio_write(AVIOContext *s, const unsigned char *buf, int size);
void avio_wl64(AVIOContext *s, uint64_t val); void avio_wl64(AVIOContext *s, uint64_t val);

17
libavformat/aviobuf.c
View File

@@ -143,6 +143,11 @@ AVIOContext *avio_alloc_context(
return s; return s;
} }
void avio_context_free(AVIOContext **ps)
{
av_freep(ps);
}
static void writeout(AVIOContext *s, const uint8_t *data, int len) static void writeout(AVIOContext *s, const uint8_t *data, int len)
{ {
if (!s->error) { if (!s->error) {
@@ -1123,7 +1128,9 @@ int avio_close(AVIOContext *s)
else else
av_log(s, AV_LOG_DEBUG, "Statistics: %"PRId64" bytes read, %d seeks\n", s->bytes_read, s->seek_count); av_log(s, AV_LOG_DEBUG, "Statistics: %"PRId64" bytes read, %d seeks\n", s->bytes_read, s->seek_count);
av_opt_free(s); av_opt_free(s);
av_free(s);
avio_context_free(&s);
return ffurl_close(h); return ffurl_close(h);
} }
@@ -1356,7 +1363,9 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
*pbuffer = d->buffer; *pbuffer = d->buffer;
size = d->size; size = d->size;
av_free(d); av_free(d);
av_free(s);
avio_context_free(&s);
return size - padding; return size - padding;
} }
@@ -1399,6 +1408,8 @@ int ffio_close_null_buf(AVIOContext *s)
size = d->size; size = d->size;
av_free(d); av_free(d);
av_free(s);
avio_context_free(&s);
return size; return size;
} }

2
libavformat/version.h
View File

@@ -32,7 +32,7 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here // Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 79 #define LIBAVFORMAT_VERSION_MINOR 80
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \