[FFmpeg-cvslog] hls: move hls_close above hls_read_header
Andreas Cadhalpun
git at videolan.org
Mon Nov 7 20:51:04 EET 2016
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Mon Nov 7 00:09:54 2016 +0100| [a305e0e5c0de4bb90c153ef067b08f437fe2483d] | committer: Andreas Cadhalpun
hls: move hls_close above hls_read_header
This is needed for the following commit.
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a305e0e5c0de4bb90c153ef067b08f437fe2483d
---
libavformat/hls.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 2bf86fa..e762bc1 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)
{
More information about the ffmpeg-cvslog
mailing list