From a036ac57828aafef2fffbaf777e7c6e2ec018476 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 12 Aug 2012 00:48:49 +0200 Subject: [PATCH] lavf: do not discard correct dts in favor of wrong pts for vc1-wmapro.ism Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 869257aae1..454271700f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1038,7 +1038,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ av_log(s, AV_LOG_DEBUG, "invalid dts/pts combination %"PRIi64"\n", pkt->dts); - pkt->dts= AV_NOPTS_VALUE; + if(strcmp(s->iformat->name, "mov,mp4,m4a,3gp,3g2,mj2")) // otherwise we discard correct timestamps for vc1-wmapro.ism + pkt->dts= AV_NOPTS_VALUE; } if (pkt->duration == 0) {