mux: drop one of the hacks comprising compute_pkt_fields2()

All encoders should output proper timestamps now.

Anton Khirnov committed 12 years ago

Commit ed7922f1 parent dc40d881 file · +0 −7Browse files

Unified · Split

libavformat/mux.c+0−7

@@ -346,13 +346,6 @@ static int compute_pkt_fields2(AVFormatContext s, AVStream st, AVPacket *pkt) · 345 unmodified lines
346	346	if (pkt->pts == AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && delay == 0)
347	347	pkt->pts = pkt->dts;
348	348
349		− //XXX/FIXME this is a temporary hack until all encoders output pts
350		− if ((pkt->pts == 0 \|\| pkt->pts == AV_NOPTS_VALUE) && pkt->dts == AV_NOPTS_VALUE && !delay) {
351		− pkt->dts =
352		−// pkt->pts= st->cur_dts;
353		− pkt->pts = st->pts.val;
354		− }
355		−
356	349	//calculate dts from pts
357	350	if (pkt->pts != AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY) {
358	351	st->pts_buffer[0] = pkt->pts;