winlin

Merge branch '2.0release' into develop

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