zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-04-30 03:23:45 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89 from sergey-dryabzhinsky/74-fix-metadata

Browse source 
Revert previous fix.
This commit is contained in:
Sergey 2016-02-28 02:15:44 +03:00
parent 12595a21aa fc013040b6
commit 2d4613c906
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ngx_rtmp_codec_module.c
View file

@ -845,6 +845,11 @@ ngx_rtmp_codec_meta_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
static ngx_rtmp_amf_elt_t in_elts[] = {
/* That string is passed by FFmpeg and possibly others (librtmp). It's skipped after at #880 */
{ NGX_RTMP_AMF_STRING,
ngx_null_string,
NULL, 0 },
{ NGX_RTMP_AMF_OBJECT,
ngx_null_string,
in_inf, sizeof(in_inf) },
@ -872,7 +877,7 @@ ngx_rtmp_codec_meta_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
v.profile[0] = '\0';
v.level[0] = '\0';
/* FFmpeg sends a string in front of actal metadata; ignore it */
/* FFmpeg sends a string in front of actual metadata; ignore it */
skip = !(in->buf->last > in->buf->pos
&& *in->buf->pos == NGX_RTMP_AMF_STRING);
if (ngx_rtmp_receive_amf(s, in, in_elts + skip,