Skip to content

Commit

Permalink
Update output_iframe_playlist description, fix space indent issue, us…
Browse files Browse the repository at this point in the history
…e ngx_conf_set_flag_slot
  • Loading branch information
Boris Tseytlin committed Apr 12, 2018
1 parent 9daebaf commit b617f76
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1526,7 +1526,7 @@ When enabled the server returns absolute segment URLs in iframe playlist request
* **default**: `on`
* **context**: `http`, `server`, `location`

When enabled iframe playlists are not returned as part of master playlists
When disabled iframe playlists are not returned as part of master playlists

#### vod_hls_master_file_name_prefix
* **syntax**: `vod_hls_master_file_name_prefix name`
Expand Down
2 changes: 1 addition & 1 deletion ngx_http_vod_hls.c
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ ngx_http_vod_hls_create_loc_conf(
conf->mpegts_muxer_config.align_frames = NGX_CONF_UNSET;
conf->mpegts_muxer_config.output_id3_timestamps = NGX_CONF_UNSET;
conf->encryption_method = NGX_CONF_UNSET_UINT;
conf->m3u8_config.output_iframes_playlist = NGX_CONF_UNSET;
conf->m3u8_config.output_iframes_playlist = NGX_CONF_UNSET;
conf->m3u8_config.force_unmuxed_segments = NGX_CONF_UNSET;
conf->m3u8_config.container_format = NGX_CONF_UNSET_UINT;
}
Expand Down
2 changes: 1 addition & 1 deletion ngx_http_vod_hls_commands.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

{ ngx_string("vod_hls_output_iframes_playlist"),
NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
ngx_conf_set_str_slot,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
BASE_OFFSET + offsetof(ngx_http_vod_hls_loc_conf_t, m3u8_config.output_iframes_playlist),
NULL },
Expand Down

0 comments on commit b617f76

Please sign in to comment.