diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-05-18 12:25:29 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-05-19 07:14:18 +0200 |
| commit | ed7922faac4ea4c893efc3cdf8102ebc49fcc011 (patch) | |
| tree | 9159b5882a93274da64af2ada6ca28a9756caffa | |
| parent | dc40d88625d7e402d58ac3f3df69fbf27aa31ea0 (diff) | |
| download | ffmpeg-ed7922faac4ea4c893efc3cdf8102ebc49fcc011.tar.gz | |
mux: drop one of the hacks comprising compute_pkt_fields2()
All encoders should output proper timestamps now.
| -rw-r--r-- | libavformat/mux.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 2e889cad1b..4d984cb48a 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -346,13 +346,6 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt) if (pkt->pts == AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && delay == 0) pkt->pts = pkt->dts; - //XXX/FIXME this is a temporary hack until all encoders output pts - if ((pkt->pts == 0 || pkt->pts == AV_NOPTS_VALUE) && pkt->dts == AV_NOPTS_VALUE && !delay) { - pkt->dts = -// pkt->pts= st->cur_dts; - pkt->pts = st->pts.val; - } - //calculate dts from pts if (pkt->pts != AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY) { st->pts_buffer[0] = pkt->pts; |