summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-10-07 01:55:34 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-10-07 01:55:34 +0000
commit6c55b27f8f7b41c34ecaf1c7986f23809adc80e0 (patch)
tree19c241302d769d88733dabe6a710ed7e79fa5d39 /ffmpeg.c
parent61c1d8e2b64f756ed4ee731ca18dc0ac426a21ef (diff)
downloadffmpeg-streaming-6c55b27f8f7b41c34ecaf1c7986f23809adc80e0.zip
ffmpeg-streaming-6c55b27f8f7b41c34ecaf1c7986f23809adc80e0.tar.gz
do not randomize unknown timestamps
Originally committed as revision 3568 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 6af03b2..62593e9 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1249,7 +1249,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
opkt.stream_index= ost->index;
opkt.data= data_buf;
opkt.size= data_size;
- opkt.pts= pkt->pts + input_files_ts_offset[ist->file_index];
+ if(pkt->pts != AV_NOPTS_VALUE)
+ opkt.pts= pkt->pts + input_files_ts_offset[ist->file_index];
+ else
+ opkt.pts= AV_NOPTS_VALUE;
opkt.dts= pkt->dts + input_files_ts_offset[ist->file_index];
opkt.flags= pkt->flags;
OpenPOWER on IntegriCloud