OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b1b818f
)
Set next_pts to pts if it is unknown and pkt->dts is not known either. This
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 17 Feb 2008 19:08:15 +0000
(19:08 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 17 Feb 2008 19:08:15 +0000
(19:08 +0000)
is needed because next_pts is used to calculate the next pts and adding
to AV_NOPTS_VALUE does not achieve the intended result.
Originally committed as revision 12132 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
59ce7ca
..
6a156dc
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-1055,6
+1055,9
@@
static int output_packet(AVInputStream *ist, int ist_index,
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
+ if(ist->next_pts == AV_NOPTS_VALUE)
+ ist->next_pts= ist->pts;
+
if (pkt == NULL) {
/* EOF handling */
ptr = NULL;