virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

libavformat: Add a function for freeing an AVFormatContext

Browse Source 
This function is useful for freeing data structures allocated by
muxers, which currently have to be freed manually by the caller.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Martin Storsjö 2011-02-04 12:04:16 +02:00 committed by Ronald S. Bultje
parent 1338dc0823
commit f124b087ee
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/avformat.h
View File

@ -1072,8 +1072,8 @@ attribute_deprecated AVFormatContext *av_alloc_format_context(void);
/** /**
* Allocate an AVFormatContext. * Allocate an AVFormatContext.
* Can be freed with av_free() but do not forget to free everything you * avformat_free_context() can be used to free the context and everything
* explicitly allocated as well! * allocated by the framework within it.
*/ */
AVFormatContext *avformat_alloc_context(void); AVFormatContext *avformat_alloc_context(void);
@ -1229,6 +1229,12 @@ void av_close_input_stream(AVFormatContext *s);
*/ */
void av_close_input_file(AVFormatContext *s); void av_close_input_file(AVFormatContext *s);
/**
* Free an AVFormatContext and all its streams.
* @param s context to free
*/
void avformat_free_context(AVFormatContext *s);
/** /**
* Add a new stream to a media file. * Add a new stream to a media file.
* *

11
libavformat/utils.c
View File

@ -2556,12 +2556,17 @@ int av_read_pause(AVFormatContext *s)
void av_close_input_stream(AVFormatContext *s) void av_close_input_stream(AVFormatContext *s)
{ {
int i;
AVStream *st;
flush_packet_queue(s); flush_packet_queue(s);
if (s->iformat->read_close) if (s->iformat->read_close)
s->iformat->read_close(s); s->iformat->read_close(s);
avformat_free_context(s);
}
void avformat_free_context(AVFormatContext *s)
{
int i;
AVStream *st;
for(i=0;i<s->nb_streams;i++) { for(i=0;i<s->nb_streams;i++) {
/* free all data in a stream component */ /* free all data in a stream component */
st = s->streams[i]; st = s->streams[i];

2
libavformat/version.h
View File

@ -24,7 +24,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 95 #define LIBAVFORMAT_VERSION_MINOR 96
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \