Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 May 2014 13:39:47 +0000 (15:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 May 2014 13:39:56 +0000 (15:39 +0200)
commit760a9ef451847b0e76dd6c825621ff277079c61b
tree680ef581d7239eb3127d94d43c72bcc75459fb03
parentac9869ffb070dce0968f338554f932dda2f8314c
parent6c5375100c4fdb2f9b1a397b9969e580b2c4fdb0
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  mpegts: always reset pes packet state on new packet
  mpegts: unref buffer in reset_pes_packet_state
  mpegts: factorize pes packet state reset function
  mpegts: fix indentation after last commit
  mpegts: only emit new packets if data buffer exists
  mpegts: remove uneeded buf_size check

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