On Sun, Feb 21, 2016 at 05:17:48PM +0100, Zalewa PL wrote:
Hi,
this patch fixes a problem with parsing ffserver.conf file.
If you had two streams, one with only the NoVideo flag and the other one
with only the NoAudio flag then the second stream would get both flags.
Best regards.
Hi, is there something wrong with my submission? It has now been a
week without reply.
i cant read the attachment it looks like double base64 encoded
Odd. I can copy pasted it on a Linux box and decoded it without problems
with `base64 -d`.
Anyway, I'm attaching the patch in plain text format now.
From 3e649ec076952cfd174a1fc08e5a5a71cbccfcba Mon Sep 17 00:00:00 2001
From: Zalewa <zalew...@gmail.com>
Date: Sat, 13 Feb 2016 15:30:15 +0100
Subject: [PATCH] ffserver: NoVideo and NoAudio flags weren't cleared between
streams.
---
ffserver_config.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ffserver_config.c b/ffserver_config.c
index 9fc1f00..0ec93b5 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -1138,6 +1138,8 @@ static int ffserver_parse_config_stream(FFServerConfig
*config, const char *cmd,
av_dict_free(&config->audio_opts);
avcodec_free_context(&config->dummy_vctx);
avcodec_free_context(&config->dummy_actx);
+ config->no_video = 0;
+ config->no_audio = 0;
*pstream = NULL;
} else if (!av_strcasecmp(cmd, "File") ||
!av_strcasecmp(cmd, "ReadOnlyFile")) {
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
