Merge remote-tracking branch 'stephenbasile/dash' into dash

Jamesits · Nov 10, 2013 · 6067ac2 · 6067ac2
2 parents 7481928 + 040c96e
commit 6067ac2
Show file tree

Hide file tree

Showing 4 changed files with 2,582 additions and 0 deletions.
diff --git a/config b/config
@@ -20,6 +20,7 @@ CORE_MODULES="$CORE_MODULES
                 ngx_rtmp_log_module                         \
                 ngx_rtmp_limit_module                       \
                 ngx_rtmp_hls_module                         \
+                ngx_rtmp_dash_module                        \
                 "
 
 
@@ -44,6 +45,7 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS                             \
                 $ngx_addon_dir/ngx_rtmp_relay_module.h      \
                 $ngx_addon_dir/ngx_rtmp_streams.h           \
                 $ngx_addon_dir/hls/ngx_rtmp_mpegts.h        \
+                $ngx_addon_dir/dash/ngx_rtmp_mp4.h          \
                 "
 
 
@@ -78,7 +80,9 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS                             \
                 $ngx_addon_dir/ngx_rtmp_log_module.c        \
                 $ngx_addon_dir/ngx_rtmp_limit_module.c      \
                 $ngx_addon_dir/hls/ngx_rtmp_hls_module.c    \
+                $ngx_addon_dir/dash/ngx_rtmp_dash_module.c  \
                 $ngx_addon_dir/hls/ngx_rtmp_mpegts.c        \
+                $ngx_addon_dir/dash/ngx_rtmp_mp4.c          \
                 "
 CFLAGS="$CFLAGS -I$ngx_addon_dir"