summaryrefslogtreecommitdiff
path: root/libavfilter/vf_framepack.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-11-11 14:58:33 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-11-11 14:58:33 +0100
commit1cb78a0dcfd05fb11a1237aa532868b4ce6eebb4 (patch)
treebe04ea5e9e89ac7647eeef3d49ecd6a08a3330a1 /libavfilter/vf_framepack.c
parentb2a8c8538d597d7b16998ff58ee57295a84dece9 (diff)
parent7d12cba95ca15198a930c05458dc414ac00c578b (diff)
Merge commit '7d12cba95ca15198a930c05458dc414ac00c578b'
* commit '7d12cba95ca15198a930c05458dc414ac00c578b': vf_framepack: Check and update frame_rate Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/vf_framepack.c')
-rw-r--r--libavfilter/vf_framepack.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavfilter/vf_framepack.c b/libavfilter/vf_framepack.c
index 621a03463f..5533c44c82 100644
--- a/libavfilter/vf_framepack.c
+++ b/libavfilter/vf_framepack.c
@@ -78,12 +78,12 @@ static av_cold void framepack_uninit(AVFilterContext *ctx)
static int config_output(AVFilterLink *outlink)
{
- AVFilterContext *ctx = outlink->src;
- FramepackContext *s = outlink->src->priv;
+ AVFilterContext *ctx = outlink->src;
+ FramepackContext *s = outlink->src->priv;
- int width = ctx->inputs[LEFT]->w;
- int height = ctx->inputs[LEFT]->h;
- AVRational time_base = ctx->inputs[LEFT]->time_base;
+ int width = ctx->inputs[LEFT]->w;
+ int height = ctx->inputs[LEFT]->h;
+ AVRational time_base = ctx->inputs[LEFT]->time_base;
AVRational frame_rate = ctx->inputs[LEFT]->frame_rate;
// check size and fps match on the other input
@@ -117,7 +117,7 @@ static int config_output(AVFilterLink *outlink)
// modify output properties as needed
switch (s->format) {
case AV_STEREO3D_FRAMESEQUENCE:
- time_base.den *= 2;
+ time_base.den *= 2;
frame_rate.num *= 2;
s->double_pts = AV_NOPTS_VALUE;
@@ -135,10 +135,10 @@ static int config_output(AVFilterLink *outlink)
return AVERROR_INVALIDDATA;
}
- outlink->w = width;
- outlink->h = height;
- outlink->time_base = time_base;
- outlink->frame_rate= frame_rate;
+ outlink->w = width;
+ outlink->h = height;
+ outlink->time_base = time_base;
+ outlink->frame_rate = frame_rate;
return 0;
}