Changeset 2765c2ec in ffmpeg

Timestamp:

Mar 22, 2014, 10:50:49 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fc567ac4

Parents:

de182701 (diff), d2f60547 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/22/14 22:50:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/22/14 22:50:49)

Message:

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>

(No files)