highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf: deprecate av_close_input_stream().

Browse Source 
And remove all its uses.
This commit is contained in:
Anton Khirnov 2011-12-11 10:01:46 +01:00
parent 59826cab8a
commit 3a7f7678eb
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avserver.c
View File

@ -2736,7 +2736,7 @@ static int http_receive_data(HTTPContext *c)
/* Now we have the actual streams */ /* Now we have the actual streams */
if (s->nb_streams != feed->nb_streams) { if (s->nb_streams != feed->nb_streams) {
av_close_input_stream(s); av_close_input_file(s);
av_free(pb); av_free(pb);
http_log("Feed '%s' stream number does not match registered feed\n", http_log("Feed '%s' stream number does not match registered feed\n",
c->stream->feed_filename); c->stream->feed_filename);
@ -2749,7 +2749,7 @@ static int http_receive_data(HTTPContext *c)
avcodec_copy_context(fst->codec, st->codec); avcodec_copy_context(fst->codec, st->codec);
} }
av_close_input_stream(s); av_close_input_file(s);
av_free(pb); av_free(pb);
} }
c->buffer_ptr = c->buffer; c->buffer_ptr = c->buffer;

11
libavformat/anm.c
View File

@ -137,16 +137,16 @@ static int read_header(AVFormatContext *s,
st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata) { if (!st->codec->extradata) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto close_and_return; goto fail;
} }
ret = avio_read(pb, st->codec->extradata, st->codec->extradata_size); ret = avio_read(pb, st->codec->extradata, st->codec->extradata_size);
if (ret < 0) if (ret < 0)
goto close_and_return; goto fail;
/* read page table */ /* read page table */
ret = avio_seek(pb, anm->page_table_offset, SEEK_SET); ret = avio_seek(pb, anm->page_table_offset, SEEK_SET);
if (ret < 0) if (ret < 0)
goto close_and_return; goto fail;
for (i = 0; i < MAX_PAGES; i++) { for (i = 0; i < MAX_PAGES; i++) {
Page *p = &anm->pt[i]; Page *p = &anm->pt[i];
@ -159,7 +159,7 @@ static int read_header(AVFormatContext *s,
anm->page = find_record(anm, 0); anm->page = find_record(anm, 0);
if (anm->page < 0) { if (anm->page < 0) {
ret = anm->page; ret = anm->page;
goto close_and_return; goto fail;
} }
anm->record = -1; anm->record = -1;
@ -169,8 +169,7 @@ invalid:
av_log_ask_for_sample(s, NULL); av_log_ask_for_sample(s, NULL);
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
close_and_return: fail:
av_close_input_stream(s);
return ret; return ret;
} }

4
libavformat/avformat.h
View File

@ -1560,11 +1560,15 @@ int av_read_play(AVFormatContext *s);
*/ */
int av_read_pause(AVFormatContext *s); int av_read_pause(AVFormatContext *s);
#if FF_API_FORMAT_PARAMETERS
/** /**
* Free a AVFormatContext allocated by av_open_input_stream. * Free a AVFormatContext allocated by av_open_input_stream.
* @param s context to free * @param s context to free
* @deprecated use av_close_input_file()
*/ */
attribute_deprecated
void av_close_input_stream(AVFormatContext *s); void av_close_input_stream(AVFormatContext *s);
#endif
/** /**
* Close a media file (but not its codecs). * Close a media file (but not its codecs).

2
libavformat/mpegts.c
View File

@ -368,7 +368,7 @@ static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
PESContext *pes = filter->u.pes_filter.opaque; PESContext *pes = filter->u.pes_filter.opaque;
av_freep(&pes->buffer); av_freep(&pes->buffer);
/* referenced private data will be freed later in /* referenced private data will be freed later in
* av_close_input_stream */ * av_close_input_file */
if (!((PESContext *)filter->u.pes_filter.opaque)->st) { if (!((PESContext *)filter->u.pes_filter.opaque)->st) {
av_freep(&filter->u.pes_filter.opaque); av_freep(&filter->u.pes_filter.opaque);
} }

2
libavformat/rtsp.c
View File

@ -580,7 +580,7 @@ void ff_rtsp_close_streams(AVFormatContext *s)
} }
av_free(rt->rtsp_streams); av_free(rt->rtsp_streams);
if (rt->asf_ctx) { if (rt->asf_ctx) {
av_close_input_stream (rt->asf_ctx); av_close_input_file(rt->asf_ctx);
rt->asf_ctx = NULL; rt->asf_ctx = NULL;
} }
av_free(rt->p); av_free(rt->p);

7
libavformat/utils.c
View File

@ -2632,6 +2632,7 @@ int av_read_pause(AVFormatContext *s)
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
#if FF_API_FORMAT_PARAMETERS
void av_close_input_stream(AVFormatContext *s) void av_close_input_stream(AVFormatContext *s)
{ {
flush_packet_queue(s); flush_packet_queue(s);
@ -2639,6 +2640,7 @@ void av_close_input_stream(AVFormatContext *s)
s->iformat->read_close(s); s->iformat->read_close(s);
avformat_free_context(s); avformat_free_context(s);
} }
#endif
void avformat_free_context(AVFormatContext *s) void avformat_free_context(AVFormatContext *s)
{ {
@ -2686,7 +2688,10 @@ void av_close_input_file(AVFormatContext *s)
{ {
AVIOContext *pb = (s->iformat->flags & AVFMT_NOFILE) || (s->flags & AVFMT_FLAG_CUSTOM_IO) ? AVIOContext *pb = (s->iformat->flags & AVFMT_NOFILE) || (s->flags & AVFMT_FLAG_CUSTOM_IO) ?
NULL : s->pb; NULL : s->pb;
av_close_input_stream(s); flush_packet_queue(s);
if (s->iformat->read_close)
s->iformat->read_close(s);
avformat_free_context(s);
if (pb) if (pb)
avio_close(pb); avio_close(pb);
} }