Merge branch 'hls-restart-on-audio'

2024-06-02 06:39:32 +02:00 · 2013-04-25 09:22:24 +04:00 · 2013-04-25 09:22:24 +04:00 · c61e99a368
parent d422c3685d 2bb16425da
commit c61e99a368
2 changed files with 927 additions and 240 deletions
--- a/README.md
+++ b/README.md
@ -285,6 +285,7 @@ rtmp_auto_push directive.
                # Serve HLS fragments
                types {
                    application/vnd.apple.mpegurl m3u8;
+                    video/mp2t ts;
                }
                alias /tmp/app;
                expires -1;
--- a/hls/ngx_rtmp_hls_module.c
+++ b/hls/ngx_rtmp_hls_module.c