external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2016-08-18 12:22:30 +08:00
commit 5d5fa7204d
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/libs/srs_librtmp.cpp
View file

@ -1433,9 +1433,12 @@ int srs_write_h264_raw_frame(Context* context,
// ignore others. // ignore others.
// 5bits, 7.3.1 NAL unit syntax, // 5bits, 7.3.1 NAL unit syntax,
// H.264-AVC-ISO_IEC_14496-10.pdf, page 44. // H.264-AVC-ISO_IEC_14496-10.pdf, page 44.
// 7: SPS, 8: PPS, 5: I Frame, 1: P Frame // 7: SPS, 8: PPS, 5: I Frame, 1: P Frame, 9: AUD
SrsAvcNaluType nut = (SrsAvcNaluType)(frame[0] & 0x1f); SrsAvcNaluType nut = (SrsAvcNaluType)(frame[0] & 0x1f);
if (nut != SrsAvcNaluTypeSPS && nut != SrsAvcNaluTypePPS && nut != SrsAvcNaluTypeIDR && nut != SrsAvcNaluTypeNonIDR) { if (nut != SrsAvcNaluTypeSPS && nut != SrsAvcNaluTypePPS
&& nut != SrsAvcNaluTypeIDR && nut != SrsAvcNaluTypeNonIDR
&& nut != SrsAvcNaluTypeAccessUnitDelimiter
) {
return ret; return ret;
} }