# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
set_callbacks( Create, Destroy );
vlc_module_end();
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"cols", "rows", "active", "element-aspect", NULL
};
w1 &= ~1;
h1 = w1 * VOUT_ASPECT_FACTOR / i_aspect&~1;
h1 &= ~1;
-
+
h2 = p_vout->output.i_height / p_vout->p_sys->i_row&~1;
h2 &= ~1;
w2 = h2 * i_aspect / VOUT_ASPECT_FACTOR&~1;
w2 &= ~1;
-
+
if ( h1 * p_vout->p_sys->i_row < p_vout->output.i_height )
{
unsigned int i_tmp;
p_vout->p_sys->i_vout = 0;
msg_Dbg( p_vout, "target window (%d,%d)-(%d,%d)", i_hstart,i_vstart,i_hend,i_vend );
-
+
i_top = 0;
i_height = 0;
i_align |= VOUT_ALIGN_RIGHT;
}
}
-
+
if( i_row * i_target_height >= i_vstart &&
( i_row + 1 ) * i_target_height <= i_vend )
{
SendEvents );
vlc_object_detach(
p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout );
- vout_Destroy(
+ vlc_object_release(
p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout );
}
}