moved vod sample access to fix flash security error

arut · arut · commit 96855b14133e · 2014-03-03T15:47:03.000+04:00
diff --git a/ngx_rtmp_play_module.c b/ngx_rtmp_play_module.c
@@ -904,10 +904,6 @@ ngx_rtmp_play_open(ngx_rtmp_session_t *s, double start)
         return NGX_ERROR;
     }
 
-    if (ngx_rtmp_send_sample_access(s) != NGX_OK) {
-        return NGX_ERROR;
-    }
-
     if (ngx_rtmp_play_join(s) != NGX_OK) {
         return NGX_ERROR;
     }
@@ -919,6 +915,10 @@ ngx_rtmp_play_open(ngx_rtmp_session_t *s, double start)
 
     ngx_rtmp_send_recorded(s, 1);
 
+    if (ngx_rtmp_send_sample_access(s) != NGX_OK) {
+        return NGX_ERROR;
+    }
+
     if (ngx_rtmp_play_do_init(s) != NGX_OK) {
         return NGX_ERROR;
     }

Original file line number	Diff line number	Diff line change
`@@ -904,10 +904,6 @@ ngx_rtmp_play_open(ngx_rtmp_session_t *s, double start)`
`904`	`904`	`return NGX_ERROR;`
`905`	`905`	`}`
`906`	`906`
`907`		`- if (ngx_rtmp_send_sample_access(s) != NGX_OK) {`
`908`		`- return NGX_ERROR;`
`909`		`- }`
`910`		`-`
`911`	`907`	`if (ngx_rtmp_play_join(s) != NGX_OK) {`
`912`	`908`	`return NGX_ERROR;`
`913`	`909`	`}`
`@@ -919,6 +915,10 @@ ngx_rtmp_play_open(ngx_rtmp_session_t *s, double start)`
`919`	`915`
`920`	`916`	`ngx_rtmp_send_recorded(s, 1);`
`921`	`917`
	`918`	`+ if (ngx_rtmp_send_sample_access(s) != NGX_OK) {`
	`919`	`+ return NGX_ERROR;`
	`920`	`+ }`
	`921`	`+`
`922`	`922`	`if (ngx_rtmp_play_do_init(s) != NGX_OK) {`
`923`	`923`	`return NGX_ERROR;`
`924`	`924`	`}`