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:
da9e86f
)
fix x11grab
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 10 Aug 2007 01:15:51 +0000
(
01:15
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 10 Aug 2007 01:15:51 +0000
(
01:15
+0000)
Originally committed as revision 10046 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
7bae725
..
fa3d624
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-1778,7
+1778,8
@@
static int av_encode(AVFormatContext **output_files,
is = input_files[ist->file_index];
ist->pts = 0;
ist->next_pts=0;
- if(input_files_ts_offset[ist->file_index] != -is->start_time)
+ if( input_files_ts_offset[ist->file_index] != -is->start_time
+ && !(is->start_time == AV_NOPTS_VALUE && input_files_ts_offset[ist->file_index]==0))
ist->next_pts= AV_NOPTS_VALUE;
ist->is_start = 1;
}