Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637'

* commit '152b797cd687e96a582a1cb908dddf3d330d7637': flv: Do not mangle dts values for negative cts Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · ca9cc6fdcc
parent 7da5ff5c18 152b797cd6
commit ca9cc6fdcc
1 changed files with 0 additions and 2 deletions
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@ -944,8 +944,6 @@ retry_duration:
                       "invalid timestamps %"PRId64" %"PRId64"\n", dts, pts);
                dts = pts = AV_NOPTS_VALUE;
            }
-            if (flv->wrong_dts)
-                dts = AV_NOPTS_VALUE;
        }
        if (type == 0 && (!st->codec->extradata || st->codec->codec_id == AV_CODEC_ID_AAC)) {
            AVDictionaryEntry *t;