summaryrefslogtreecommitdiff
path: root/libavformat/anm.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-12-11 10:01:46 +0100
committerAnton Khirnov <anton@khirnov.net>2011-12-12 20:21:47 +0100
commit3a7f7678eb3be1f9a28414c9908ed8d34b1b9846 (patch)
tree4f74061acc8f586c6273ceea7bdaab77cd9c6e2a /libavformat/anm.c
parent59826cab8ad9f64bf5fd752f52c6acc16815dbb0 (diff)
lavf: deprecate av_close_input_stream().
And remove all its uses.
Diffstat (limited to 'libavformat/anm.c')
-rw-r--r--libavformat/anm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/libavformat/anm.c b/libavformat/anm.c
index 00a36abebe..7ceb2d8918 100644
--- a/libavformat/anm.c
+++ b/libavformat/anm.c
@@ -137,16 +137,16 @@ static int read_header(AVFormatContext *s,
st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata) {
ret = AVERROR(ENOMEM);
- goto close_and_return;
+ goto fail;
}
ret = avio_read(pb, st->codec->extradata, st->codec->extradata_size);
if (ret < 0)
- goto close_and_return;
+ goto fail;
/* read page table */
ret = avio_seek(pb, anm->page_table_offset, SEEK_SET);
if (ret < 0)
- goto close_and_return;
+ goto fail;
for (i = 0; i < MAX_PAGES; i++) {
Page *p = &anm->pt[i];
@@ -159,7 +159,7 @@ static int read_header(AVFormatContext *s,
anm->page = find_record(anm, 0);
if (anm->page < 0) {
ret = anm->page;
- goto close_and_return;
+ goto fail;
}
anm->record = -1;
@@ -169,8 +169,7 @@ invalid:
av_log_ask_for_sample(s, NULL);
ret = AVERROR_INVALIDDATA;
-close_and_return:
- av_close_input_stream(s);
+fail:
return ret;
}