generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a av_close_input_stream function

Browse Source 
Originally committed as revision 11269 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2007-12-19 14:07:13 +00:00
parent 2e9b86ac12
commit 2506fd5467
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@@ -661,6 +661,12 @@ int av_read_play(AVFormatContext *s);
*/ */
int av_read_pause(AVFormatContext *s); int av_read_pause(AVFormatContext *s);
/**
* Free a AVFormatContext allocated by av_open_input_stream.
* @param s context to free
*/
void av_close_input_stream(AVFormatContext *s);
/** /**
* Close a media file (but not its codecs). * Close a media file (but not its codecs).
* *

12
libavformat/utils.c
View File

@@ -2056,7 +2056,7 @@ int av_read_pause(AVFormatContext *s)
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
void av_close_input_file(AVFormatContext *s) void av_close_input_stream(AVFormatContext *s)
{ {
int i; int i;
AVStream *st; AVStream *st;
@@ -2085,12 +2085,18 @@ void av_close_input_file(AVFormatContext *s)
av_freep(&s->programs[i]); av_freep(&s->programs[i]);
} }
flush_packet_queue(s); flush_packet_queue(s);
if (!(s->iformat->flags & AVFMT_NOFILE))
url_fclose(s->pb);
av_freep(&s->priv_data); av_freep(&s->priv_data);
av_free(s); av_free(s);
} }
void av_close_input_file(AVFormatContext *s)
{
ByteIOContext *pb = s->iformat->flags & AVFMT_NOFILE ? NULL : s->pb;
av_close_input_stream(s);
if (pb)
url_fclose(pb);
}
AVStream *av_new_stream(AVFormatContext *s, int id) AVStream *av_new_stream(AVFormatContext *s, int id)
{ {
AVStream *st; AVStream *st;