diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-06 15:39:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-06 15:39:56 +0200 |
| commit | 760a9ef451847b0e76dd6c825621ff277079c61b (patch) | |
| tree | 680ef581d7239eb3127d94d43c72bcc75459fb03 /COPYING.GPLv3 | |
| parent | ac9869ffb070dce0968f338554f932dda2f8314c (diff) | |
| parent | 6c5375100c4fdb2f9b1a397b9969e580b2c4fdb0 (diff) | |
| download | ffmpeg-760a9ef451847b0e76dd6c825621ff277079c61b.tar.gz | |
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>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions