Commit ca9cc6fd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '152b797c'

* commit '152b797c':
  flv: Do not mangle dts values for negative cts
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7da5ff5c 152b797c
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment