summaryrefslogtreecommitdiff
path: root/libavformat/hls.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-07 00:09:54 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-07 19:43:43 +0100
commita305e0e5c0de4bb90c153ef067b08f437fe2483d (patch)
tree94442aeb6b902a9ce18ad2016e3c3a944c144e93 /libavformat/hls.c
parent5249706e9d2ec5ed1b07d8ffdbb8fb9104261f6d (diff)
hls: move hls_close above hls_read_header
This is needed for the following commit. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavformat/hls.c')
-rw-r--r--libavformat/hls.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 2bf86fadc6..e762bc19fc 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1593,6 +1593,19 @@ static void update_noheader_flag(AVFormatContext *s)
s->ctx_flags &= ~AVFMTCTX_NOHEADER;
}
+static int hls_close(AVFormatContext *s)
+{
+ HLSContext *c = s->priv_data;
+
+ free_playlist_list(c);
+ free_variant_list(c);
+ free_rendition_list(c);
+
+ av_dict_free(&c->avio_opts);
+
+ return 0;
+}
+
static int hls_read_header(AVFormatContext *s)
{
void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb;
@@ -2013,19 +2026,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_EOF;
}
-static int hls_close(AVFormatContext *s)
-{
- HLSContext *c = s->priv_data;
-
- free_playlist_list(c);
- free_variant_list(c);
- free_rendition_list(c);
-
- av_dict_free(&c->avio_opts);
-
- return 0;
-}
-
static int hls_read_seek(AVFormatContext *s, int stream_index,
int64_t timestamp, int flags)
{