[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

Michael Niedermayer git at videolan.org
Tue May 6 15:47:38 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  6 15:39:47 2014 +0200| [760a9ef451847b0e76dd6c825621ff277079c61b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=760a9ef451847b0e76dd6c825621ff277079c61b
---





More information about the ffmpeg-cvslog mailing list