From e33d3720239314d28a48c64c1071ba9c048280d1 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 20 Nov 2015 03:09:28 +0100
Subject: [PATCH] ffserver: Use AVOption API to access ffm demuxer instead of
direct access depending on ABI
server_attached is newly added so the demuxer knows if there is an attached server
that can update the write index. This is needed to fix a infinite loop
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
ffserver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index fb8ab7d3e71..7e4f6208c53 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -300,9 +300,9 @@ bail_eio:
static void ffm_set_write_index(AVFormatContext *s, int64_t pos,
int64_t file_size)
{
- FFMContext *ffm = s->priv_data;
- ffm->write_index = pos;
- ffm->file_size = file_size;
+ av_opt_set_int(s, "server_attached", 1, AV_OPT_SEARCH_CHILDREN);
+ av_opt_set_int(s, "write_index", pos, AV_OPT_SEARCH_CHILDREN);
+ av_opt_set_int(s, "file_size", file_size, AV_OPT_SEARCH_CHILDREN);
}
static char *ctime1(char *buf2, size_t buf_size)
--
GitLab