[vlc-commits] splitter: remove write-only window position
Rémi Denis-Courmont
git at videolan.org
Mon Apr 1 19:46:09 CEST 2019
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Apr 1 20:25:09 2019 +0300| [00dbd258f797aeae98a3c2b0e3a7b5c66b98ba27] | committer: Rémi Denis-Courmont
splitter: remove write-only window position
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=00dbd258f797aeae98a3c2b0e3a7b5c66b98ba27
---
include/vlc_video_splitter.h | 10 ----------
modules/video_splitter/clone.c | 2 --
modules/video_splitter/panoramix.c | 10 +---------
modules/video_splitter/wall.c | 2 --
4 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/include/vlc_video_splitter.h b/include/vlc_video_splitter.h
index 4c6ac96a1a..092c761fc3 100644
--- a/include/vlc_video_splitter.h
+++ b/include/vlc_video_splitter.h
@@ -44,16 +44,6 @@ typedef struct
/* Video format of the output */
video_format_t fmt;
- /* Window hints */
- struct
- {
- /* Relative position.
- * (0,0) is equal to the default position.
- */
- int i_x;
- int i_y;
- } window;
-
/* Video output module
* Use NULL for default
*/
diff --git a/modules/video_splitter/clone.c b/modules/video_splitter/clone.c
index e787e525a4..6219a40320 100644
--- a/modules/video_splitter/clone.c
+++ b/modules/video_splitter/clone.c
@@ -146,8 +146,6 @@ static int Open( vlc_object_t *p_this )
{
video_splitter_output_t *p_cfg = &p_splitter->p_output[i];
video_format_Copy( &p_cfg->fmt, &p_splitter->fmt );
- p_cfg->window.i_x = 0;
- p_cfg->window.i_y = 0;
}
/* */
diff --git a/modules/video_splitter/panoramix.c b/modules/video_splitter/panoramix.c
index e5877fdf77..9790bb2c4a 100644
--- a/modules/video_splitter/panoramix.c
+++ b/modules/video_splitter/panoramix.c
@@ -240,9 +240,7 @@ typedef struct
bool b_active;
int i_output;
- /* Output position and size */
- int i_x;
- int i_y;
+ /* Output size */
int i_width;
int i_height;
@@ -678,9 +676,6 @@ static int Open( vlc_object_t *p_this )
p_cfg->fmt.i_visible_height =
p_cfg->fmt.i_height = p_output->i_height;
- p_cfg->window.i_x = p_output->i_x;
- p_cfg->window.i_y = p_output->i_y;
-
p_cfg->psz_module = NULL;
}
}
@@ -908,9 +903,6 @@ static int Configuration( panoramix_output_t pp_output[ROW_MAX][COL_MAX],
p_output->filter = cfg;
/* */
- p_output->i_x = i_dst_x;
- p_output->i_y = i_dst_y;
-
p_output->i_width = cfg.black.i_left + p_output->i_src_width + cfg.black.i_right;
p_output->i_height = cfg.black.i_top + p_output->i_src_height + cfg.black.i_bottom;
diff --git a/modules/video_splitter/wall.c b/modules/video_splitter/wall.c
index 0fa4c7810c..6a7b430287 100644
--- a/modules/video_splitter/wall.c
+++ b/modules/video_splitter/wall.c
@@ -338,8 +338,6 @@ static int Open( vlc_object_t *p_this )
p_cfg->fmt.i_height = p_output->i_height;
p_cfg->fmt.i_sar_num = p_splitter->fmt.i_sar_num;
p_cfg->fmt.i_sar_den = p_splitter->fmt.i_sar_den;
- p_cfg->window.i_x = p_output->i_left;
- p_cfg->window.i_y = p_output->i_top;
p_cfg->psz_module = NULL;
}
}
More information about the vlc-commits
mailing list