summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-08-10 01:15:51 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-08-10 01:15:51 +0000
commitde2aeaef026b1396f7bd4d618805e836af7b812b (patch)
tree89b869a90e964958d61604c67b9399384ddbf9e2 /ffmpeg.c
parentda9e86f83d59909b78730191ae2c3200ab7674d5 (diff)
fix x11grab
Originally committed as revision 10046 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 7bae7257f7..fa3d6244ab 100644
--- 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;
}