diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-07 17:26:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-19 01:19:32 +0200 |
| commit | 0fcc252829a58f25fada8a93278bfb2ac29f2237 (patch) | |
| tree | f3770ae170e7ee992a29534d680cf13f0c1fe767 | |
| parent | b51d5c99b899c70821d661b6dd2c5f4e2d19d8da (diff) | |
| download | ffmpeg-0fcc252829a58f25fada8a93278bfb2ac29f2237.tar.gz | |
Revert "avfilter/trim: add compatibility layer to not break ABI used by ffmpeg"
This reverts commit 9219ec93b145725ac74fbfbde7f67ac5135b85cf.
Fixes Ticket 5411
| -rw-r--r-- | libavfilter/trim.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/libavfilter/trim.c b/libavfilter/trim.c index 9141ac5ef1..9daaeafa80 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <float.h> -#include <math.h> #include <stdint.h> #include "config.h" @@ -43,9 +41,6 @@ typedef struct TrimContext { int64_t duration; int64_t start_time, end_time; int64_t start_frame, end_frame; - - double duration_dbl; - double start_time_dbl, end_time_dbl; /* * in the link timebase for video, * in 1/samplerate for audio @@ -91,13 +86,6 @@ static int config_input(AVFilterLink *inlink) AVRational tb = (inlink->type == AVMEDIA_TYPE_VIDEO) ? inlink->time_base : (AVRational){ 1, inlink->sample_rate }; - if (s->start_time_dbl != DBL_MAX) - s->start_time = s->start_time_dbl * 1e6; - if (s->end_time_dbl != DBL_MAX) - s->end_time = s->end_time_dbl * 1e6; - if (s->duration_dbl != 0) - s->duration = s->duration_dbl * 1e6; - if (s->start_time != INT64_MAX) { int64_t start_pts = av_rescale_q(s->start_time, AV_TIME_BASE_Q, tb); if (s->start_pts == AV_NOPTS_VALUE || start_pts < s->start_pts) @@ -116,23 +104,21 @@ static int config_input(AVFilterLink *inlink) #define OFFSET(x) offsetof(TrimContext, x) #define COMMON_OPTS \ + { "start", "Timestamp of the first frame that " \ + "should be passed", OFFSET(start_time), AV_OPT_TYPE_DURATION, { .i64 = INT64_MAX }, INT64_MIN, INT64_MAX, FLAGS }, \ { "starti", "Timestamp of the first frame that " \ "should be passed", OFFSET(start_time), AV_OPT_TYPE_DURATION, { .i64 = INT64_MAX }, INT64_MIN, INT64_MAX, FLAGS }, \ + { "end", "Timestamp of the first frame that " \ + "should be dropped again", OFFSET(end_time), AV_OPT_TYPE_DURATION, { .i64 = INT64_MAX }, INT64_MIN, INT64_MAX, FLAGS }, \ { "endi", "Timestamp of the first frame that " \ "should be dropped again", OFFSET(end_time), AV_OPT_TYPE_DURATION, { .i64 = INT64_MAX }, INT64_MIN, INT64_MAX, FLAGS }, \ { "start_pts", "Timestamp of the first frame that should be " \ " passed", OFFSET(start_pts), AV_OPT_TYPE_INT64, { .i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, FLAGS }, \ { "end_pts", "Timestamp of the first frame that should be " \ "dropped again", OFFSET(end_pts), AV_OPT_TYPE_INT64, { .i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, FLAGS }, \ + { "duration", "Maximum duration of the output", OFFSET(duration), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT64_MAX, FLAGS }, \ { "durationi", "Maximum duration of the output", OFFSET(duration), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT64_MAX, FLAGS }, -#define COMPAT_OPTS \ - { "start", "Timestamp in seconds of the first frame that " \ - "should be passed", OFFSET(start_time_dbl),AV_OPT_TYPE_DOUBLE, { .dbl = DBL_MAX }, -DBL_MAX, DBL_MAX, FLAGS }, \ - { "end", "Timestamp in seconds of the first frame that " \ - "should be dropped again", OFFSET(end_time_dbl), AV_OPT_TYPE_DOUBLE, { .dbl = DBL_MAX }, -DBL_MAX, DBL_MAX, FLAGS }, \ - { "duration", "Maximum duration of the output in seconds", OFFSET(duration_dbl), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, 0, DBL_MAX, FLAGS }, - #if CONFIG_TRIM_FILTER static int trim_filter_frame(AVFilterLink *inlink, AVFrame *frame) @@ -197,7 +183,6 @@ static const AVOption trim_options[] = { "to the output", OFFSET(start_frame), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS }, { "end_frame", "Number of the first frame that should be dropped " "again", OFFSET(end_frame), AV_OPT_TYPE_INT64, { .i64 = INT64_MAX }, 0, INT64_MAX, FLAGS }, - COMPAT_OPTS { NULL } }; #undef FLAGS @@ -352,7 +337,6 @@ static const AVOption atrim_options[] = { "passed to the output", OFFSET(start_sample), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS }, { "end_sample", "Number of the first audio sample that should be " "dropped again", OFFSET(end_sample), AV_OPT_TYPE_INT64, { .i64 = INT64_MAX }, 0, INT64_MAX, FLAGS }, - COMPAT_OPTS { NULL } }; #undef FLAGS |