winlin

Merge branch '2.0release' into develop

@@ -1214,7 +1214,7 @@ int SrsTsAdaptationField::encode(SrsBuffer* stream) @@ -1214,7 +1214,7 @@ int SrsTsAdaptationField::encode(SrsBuffer* stream)
1214 // @see https://github.com/ossrs/srs/issues/250#issuecomment-71349370 1214 // @see https://github.com/ossrs/srs/issues/250#issuecomment-71349370
1215 int64_t pcrv = program_clock_reference_extension & 0x1ff; 1215 int64_t pcrv = program_clock_reference_extension & 0x1ff;
1216 pcrv |= (const1_value0 << 9) & 0x7E00; 1216 pcrv |= (const1_value0 << 9) & 0x7E00;
1217 - pcrv |= (program_clock_reference_base << 15) & 0x1FFFFFFFF000000LL; 1217 + pcrv |= (program_clock_reference_base << 15) & 0xFFFFFFFF8000LL;
1218 1218
1219 pp = (char*)&pcrv; 1219 pp = (char*)&pcrv;
1220 *p++ = pp[5]; 1220 *p++ = pp[5];