diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-08-07 14:46:07 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-08-07 16:20:41 +0200 |
| commit | dd9555e94b1481a6992ee89b285232e5abcf9089 (patch) | |
| tree | 1b0d378d165675ee625c207a8049c41d1461d6f2 /ffmpeg_filter.c | |
| parent | 39bb26f91b18a6fb6d2ccfb6464b8a87787587fe (diff) | |
| download | ffmpeg-dd9555e94b1481a6992ee89b285232e5abcf9089.tar.gz | |
ffmpeg: remove obsolete workaround in trim insertion.
The bug it was working seems to have been fixed.
This change causes ffmpeg to use the trim filter to implement
the -t option.
FATE tests are updated due to the more accurate handling of
the last packets.
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index c8164ed62d..e17c4a5988 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -290,10 +290,6 @@ static int insert_trim(int64_t start_time, int64_t duration, if (duration == INT64_MAX && start_time == AV_NOPTS_VALUE) return 0; - // Use with duration and without output starttime is buggy with trim filters - if (start_time == AV_NOPTS_VALUE) - return 0; - trim = avfilter_get_by_name(name); if (!trim) { av_log(NULL, AV_LOG_ERROR, "%s filter not present, cannot limit " |