summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-09-20 21:41:12 +0200
committerPaul B Mahol <onemda@gmail.com>2019-09-20 21:41:12 +0200
commit8b58d9cb474c81da83157e858e2a115c6cc480cd (patch)
tree0a5732e61c6c0625147978be55933b7061f59413
parent5c93a0a1e40969802f67647aaf2f4ce64f469db0 (diff)
downloadffmpeg-streaming-8b58d9cb474c81da83157e858e2a115c6cc480cd.zip
ffmpeg-streaming-8b58d9cb474c81da83157e858e2a115c6cc480cd.tar.gz
avfilter/vf_v360: remove uneeded array element
-rw-r--r--libavfilter/v360.h2
-rw-r--r--libavfilter/vf_v360.c12
2 files changed, 6 insertions, 8 deletions
diff --git a/libavfilter/v360.h b/libavfilter/v360.h
index 50ed91e..70b3026 100644
--- a/libavfilter/v360.h
+++ b/libavfilter/v360.h
@@ -121,7 +121,7 @@ typedef struct V360Context {
int in_transpose, out_transpose;
float h_fov, v_fov, d_fov;
- float flat_range[3];
+ float flat_range[2];
float rot_mat[3][3];
diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c
index 6f1359d..11fdd00 100644
--- a/libavfilter/vf_v360.c
+++ b/libavfilter/vf_v360.c
@@ -1916,9 +1916,8 @@ static int prepare_flat_out(AVFilterContext *ctx)
const float h_angle = 0.5f * s->h_fov * M_PI / 180.f;
const float v_angle = 0.5f * s->v_fov * M_PI / 180.f;
- s->flat_range[0] = tanf(h_angle);
- s->flat_range[1] = tanf(v_angle);
- s->flat_range[2] = -1.f;
+ s->flat_range[0] = tanf(h_angle);
+ s->flat_range[1] = tanf(v_angle);
return 0;
}
@@ -1939,11 +1938,10 @@ static void flat_to_xyz(const V360Context *s,
{
const float l_x = s->flat_range[0] * (2.f * i / width - 1.f);
const float l_y = -s->flat_range[1] * (2.f * j / height - 1.f);
- const float l_z = s->flat_range[2];
- vec[0] = l_x;
- vec[1] = l_y;
- vec[2] = l_z;
+ vec[0] = l_x;
+ vec[1] = l_y;
+ vec[2] = -1.f;
normalize_vector(vec);
}
OpenPOWER on IntegriCloud