Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 00:05:04 +0000 (02:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 00:05:13 +0000 (02:05 +0200)
* cehoyos/master:
  Use 0x88 as stream id when muxing DTS in program streams.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge