generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637'

Browse Source 
* commit '152b797cd687e96a582a1cb908dddf3d330d7637':
  flv: Do not mangle dts values for negative cts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-24 21:49:02 +02:00
commit ca9cc6fdcc
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/flvdec.c
View File

@ -944,8 +944,6 @@ retry_duration:
"invalid timestamps %"PRId64" %"PRId64"\n", dts, pts); "invalid timestamps %"PRId64" %"PRId64"\n", dts, pts);
dts = pts = AV_NOPTS_VALUE; 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)) { if (type == 0 && (!st->codec->extradata || st->codec->codec_id == AV_CODEC_ID_AAC)) {
AVDictionaryEntry *t; AVDictionaryEntry *t;