OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1677155
)
10l (rescaling AV_NOPTS_VALUE)
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 12 May 2005 16:28:24 +0000
(16:28 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 12 May 2005 16:28:24 +0000
(16:28 +0000)
Originally committed as revision 4227 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
604eb15
..
bd4d2f5
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-1782,7
+1782,7
@@
static int av_encode(AVFormatContext **output_files,
is = input_files[ist->file_index];
ist->pts = 0;
ist->next_pts = av_rescale_q(ist->st->start_time, ist->st->time_base, AV_TIME_BASE_Q);
- if(ist->
next_pts
== AV_NOPTS_VALUE)
+ if(ist->
st->start_time
== AV_NOPTS_VALUE)
ist->next_pts=0;
if(input_files_ts_offset[ist->file_index])
ist->next_pts= AV_NOPTS_VALUE;