diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-24 21:49:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-24 21:50:28 +0200 |
| commit | ca9cc6fdcc78d964d37ca387d0bccbfbab21dbee (patch) | |
| tree | a7e116df7d291335e6a73e349a6fa6a306542fc1 /libavformat/flvdec.c | |
| parent | 7da5ff5c18ae3f9d0943e41fb637a6ebefa9277f (diff) | |
| parent | 152b797cd687e96a582a1cb908dddf3d330d7637 (diff) | |
| download | ffmpeg-ca9cc6fdcc78d964d37ca387d0bccbfbab21dbee.tar.gz | |
Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637'
* commit '152b797cd687e96a582a1cb908dddf3d330d7637':
flv: Do not mangle dts values for negative cts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index c19c2d663a..67a5e43584 100644 --- 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; |