Revision f124b087

View differences:

libavformat/avformat.h
1072 1072

  
1073 1073
/**
1074 1074
 * Allocate an AVFormatContext.
1075
 * Can be freed with av_free() but do not forget to free everything you
1076
 * explicitly allocated as well!
1075
 * avformat_free_context() can be used to free the context and everything
1076
 * allocated by the framework within it.
1077 1077
 */
1078 1078
AVFormatContext *avformat_alloc_context(void);
1079 1079

  
......
1230 1230
void av_close_input_file(AVFormatContext *s);
1231 1231

  
1232 1232
/**
1233
 * Free an AVFormatContext and all its streams.
1234
 * @param s context to free
1235
 */
1236
void avformat_free_context(AVFormatContext *s);
1237

  
1238
/**
1233 1239
 * Add a new stream to a media file.
1234 1240
 *
1235 1241
 * Can only be called in the read_header() function. If the flag
libavformat/utils.c
2556 2556

  
2557 2557
void av_close_input_stream(AVFormatContext *s)
2558 2558
{
2559
    int i;
2560
    AVStream *st;
2561

  
2562 2559
    flush_packet_queue(s);
2563 2560
    if (s->iformat->read_close)
2564 2561
        s->iformat->read_close(s);
2562
    avformat_free_context(s);
2563
}
2564

  
2565
void avformat_free_context(AVFormatContext *s)
2566
{
2567
    int i;
2568
    AVStream *st;
2569

  
2565 2570
    for(i=0;i<s->nb_streams;i++) {
2566 2571
        /* free all data in a stream component */
2567 2572
        st = s->streams[i];
libavformat/version.h
24 24
#include "libavutil/avutil.h"
25 25

  
26 26
#define LIBAVFORMAT_VERSION_MAJOR 52
27
#define LIBAVFORMAT_VERSION_MINOR 95
27
#define LIBAVFORMAT_VERSION_MINOR 96
28 28
#define LIBAVFORMAT_VERSION_MICRO  0
29 29

  
30 30
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

Also available in: Unified diff