projects
/
vuplus_xbmc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e79d4a
)
Revert "mpegts: do not set pts for missing dts in video streams"
author
Rainer Hochecker
<fernetmenta@online.de>
Mon, 3 Mar 2014 07:41:00 +0000
(08:41 +0100)
committer
Rainer Hochecker
<fernetmenta@online.de>
Mon, 3 Mar 2014 07:41:00 +0000
(08:41 +0100)
This reverts commit
55562c856bbcca1b8e1ac1813209de7154570443
.
lib/ffmpeg/libavformat/mpegts.c
patch
|
blob
|
history
diff --git
a/lib/ffmpeg/libavformat/mpegts.c
b/lib/ffmpeg/libavformat/mpegts.c
index
1ae699b
..
70242b1
100644
(file)
--- a/
lib/ffmpeg/libavformat/mpegts.c
+++ b/
lib/ffmpeg/libavformat/mpegts.c
@@
-972,10
+972,7
@@
static int mpegts_push_data(MpegTSFilter *filter,
pes->pts = AV_NOPTS_VALUE;
pes->dts = AV_NOPTS_VALUE;
if ((flags & 0xc0) == 0x80) {
- pes->pts = ff_parse_pes_pts(r);
- /* video pts is not monotonic, can't be used for dts */
- if (pes->st->codec->codec_type != AVMEDIA_TYPE_VIDEO)
- pes->dts = pes->pts;
+ pes->dts = pes->pts = ff_parse_pes_pts(r);
r += 5;
} else if ((flags & 0xc0) == 0xc0) {
pes->pts = ff_parse_pes_pts(r);