[FFmpeg-cvslog] mux: drop one of the hacks comprising compute_pkt_fields2()

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun May 18 12:25:29 2014 +0200| [ed7922faac4ea4c893efc3cdf8102ebc49fcc011] | committer: Anton Khirnov

mux: drop one of the hacks comprising compute_pkt_fields2()

All encoders should output proper timestamps now.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed7922faac4ea4c893efc3cdf8102ebc49fcc011
---

 libavformat/mux.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 2e889ca..4d984cb 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;