aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-02-17 20:12:44 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-02-17 20:12:44 +0000
commit48291040ea28698efa707c002cff87c2f288e771 (patch)
tree51c84170f17b3605d5342b1196757cbf4b5adfaf /ffmpeg.c
parent40cb57a287977f8b88657abf30e8787477d6c448 (diff)
downloadffmpeg-48291040ea28698efa707c002cff87c2f288e771.tar.gz
Set initial next_pts to unknown, this avoids the nonsense timestamp
discontinuity at the start. I hope this has no sideeffects, if it does send a bugreport! fixes issue137 Originally committed as revision 12134 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index cd47b20515..36d6a293eb 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1826,10 +1826,7 @@ static int av_encode(AVFormatContext **output_files,
ist = ist_table[i];
is = input_files[ist->file_index];
ist->pts = 0;
- ist->next_pts=0;
- 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->next_pts = AV_NOPTS_VALUE;
ist->is_start = 1;
}