[FFmpeg-cvslog] avformat/utils: treat flv like mov with timestamp discarding

Michael Niedermayer git at videolan.org
Sun Dec 15 05:02:16 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 15 04:17:05 2013 +0100| [f6cd447bf1059d468249259189ca6c0508e5d461] | committer: Michael Niedermayer

avformat/utils: treat flv like mov with timestamp discarding

This prevents a regression when using an avparser with flv h264

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/utils.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6dc941b..8687cff 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1079,7 +1079,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);
-        if(strcmp(s->iformat->name, "mov,mp4,m4a,3gp,3g2,mj2")) // otherwise we discard correct timestamps for vc1-wmapro.ism
+        if (    strcmp(s->iformat->name, "mov,mp4,m4a,3gp,3g2,mj2")
+             && strcmp(s->iformat->name, "flv")) // otherwise we discard correct timestamps for vc1-wmapro.ism
             pkt->dts= AV_NOPTS_VALUE;
     }
 



More information about the ffmpeg-cvslog mailing list