diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:50:45 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:50:49 +0100 |
commit | 2765c2ec7d5ec50f5852fe65f89c4a9e238f2157 (patch) | |
tree | 1499082fbb8148e9829913f6eee172fcaf2d7770 /libavcodec | |
parent | de182701ac9e5c6f571e21ba1fffb1fa8d0f808d (diff) | |
parent | d2f60547c23018ab1bd007260b3d2fb93957cbb0 (diff) | |
download | ffmpeg-2765c2ec7d5ec50f5852fe65f89c4a9e238f2157.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
mpegts: fix teletext pts of streams with standalone pcr pid
mpegts: add pcr filter for tracking standalone pcr pids
mpegts: factorize mpegts filter creator code
mpegts: move last_pcr to MpegTSFilter level
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions