diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 12:35:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 12:41:04 +0200 |
| commit | b7fc2693c70fe72936e4ce124c802ac23857c476 (patch) | |
| tree | 6633a69bc7ab53e1478bb2210e25b834da038aa5 /ffmpeg_filter.c | |
| parent | 6d77279ed81c5db8a9f7b895d5090c0328c12174 (diff) | |
| parent | 488a0fa68973d48e264d54f1722f7afb18afbea7 (diff) | |
Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
avconv: support -t as an input option.
Conflicts:
Changelog
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 21b33432c4..c8164ed62d 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -698,7 +698,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, snprintf(name, sizeof(name), "trim for input stream %d:%d", ist->file_index, ist->st->index); ret = insert_trim(((f->start_time == AV_NOPTS_VALUE) || !f->accurate_seek) ? - AV_NOPTS_VALUE : 0, INT64_MAX, &last_filter, &pad_idx, name); + AV_NOPTS_VALUE : 0, f->recording_time, &last_filter, &pad_idx, name); if (ret < 0) return ret; @@ -795,7 +795,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, snprintf(name, sizeof(name), "trim for input stream %d:%d", ist->file_index, ist->st->index); ret = insert_trim(((f->start_time == AV_NOPTS_VALUE) || !f->accurate_seek) ? - AV_NOPTS_VALUE : 0, INT64_MAX, &last_filter, &pad_idx, name); + AV_NOPTS_VALUE : 0, f->recording_time, &last_filter, &pad_idx, name); if (ret < 0) return ret; |