winlin

Merge #841, avoid the duplicated sps/pps in ts. 2.0.236

@@ -336,6 +336,7 @@ Remark: @@ -336,6 +336,7 @@ Remark:
336 336
337 ## History 337 ## History
338 338
  339 +* v2.0, 2017-04-15, Merge [#841][bug #841], avoid the duplicated sps/pps in ts. 2.0.236
339 * v2.0, 2017-04-09, Fix [#834][bug #834], crash for TS context corrupt. 2.0.235 340 * v2.0, 2017-04-09, Fix [#834][bug #834], crash for TS context corrupt. 2.0.235
340 * <strong>v2.0, 2017-03-03, [2.0 release0(2.0.234)][r2.0r0] released. 86373 lines.</strong> 341 * <strong>v2.0, 2017-03-03, [2.0 release0(2.0.234)][r2.0r0] released. 86373 lines.</strong>
341 * v2.0, 2017-02-25, for [#730][bug #730], remove the test code. 2.0.234 342 * v2.0, 2017-02-25, for [#730][bug #730], remove the test code. 2.0.234
@@ -1281,6 +1282,7 @@ Winlin @@ -1281,6 +1282,7 @@ Winlin
1281 [bug #752]: https://github.com/ossrs/srs/issues/752 1282 [bug #752]: https://github.com/ossrs/srs/issues/752
1282 [bug #503]: https://github.com/ossrs/srs/issues/503 1283 [bug #503]: https://github.com/ossrs/srs/issues/503
1283 [bug #834]: https://github.com/ossrs/srs/issues/834 1284 [bug #834]: https://github.com/ossrs/srs/issues/834
  1285 +[bug #841]: https://github.com/ossrs/srs/issues/841
1284 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx 1286 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
1285 1287
1286 [exo #828]: https://github.com/google/ExoPlayer/pull/828 1288 [exo #828]: https://github.com/google/ExoPlayer/pull/828
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 235 34 +#define VERSION_REVISION 236
35 35
36 // generated by configure, only macros. 36 // generated by configure, only macros.
37 #include <srs_auto_headers.hpp> 37 #include <srs_auto_headers.hpp>