Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

trying to fix the -ss bugs

Browse Source 
Originally committed as revision 3843 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 20 years ago
parent d06c75a830
commit fdb86eb10d
1 changed files with 3 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ffmpeg.c

4
ffmpeg.c
Unescape View File

@ -1756,6 +1756,8 @@ static int av_encode(AVFormatContext **output_files,
ist->next_pts = ist->st->start_time; ist->next_pts = ist->st->start_time;
if(ist->next_pts == AV_NOPTS_VALUE) if(ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts=0; ist->next_pts=0;
if(input_files_ts_offset[ist->file_index])
ist->next_pts= AV_NOPTS_VALUE;
ist->is_start = 1; ist->is_start = 1;
} }
@ -1897,7 +1899,7 @@ static int av_encode(AVFormatContext **output_files,
goto discard_packet; goto discard_packet;
// fprintf(stderr, "next:%lld dts:%lld off:%lld %d\n", ist->next_pts, pkt.dts, input_files_ts_offset[ist->file_index], ist->st->codec.codec_type); // fprintf(stderr, "next:%lld dts:%lld off:%lld %d\n", ist->next_pts, pkt.dts, input_files_ts_offset[ist->file_index], ist->st->codec.codec_type);
if (pkt.dts != AV_NOPTS_VALUE) { if (pkt.dts != AV_NOPTS_VALUE && ist->next_pts != AV_NOPTS_VALUE) {
int64_t delta= pkt.dts - ist->next_pts; int64_t delta= pkt.dts - ist->next_pts;
if(ABS(delta) > 10LL*AV_TIME_BASE && !copy_ts){ if(ABS(delta) > 10LL*AV_TIME_BASE && !copy_ts){
input_files_ts_offset[ist->file_index]-= delta; input_files_ts_offset[ist->file_index]-= delta;

Write Preview
Loading…
Cancel
Save