Commit a7139d45 authored by Laurent Aimar's avatar Laurent Aimar

Moved snapshot_t structure to the only place where it is used.

parent aaf2ac90
...@@ -743,17 +743,6 @@ enum output_query_e ...@@ -743,17 +743,6 @@ enum output_query_e
VOUT_REDRAW_RECT, /* arg1= area rect, res= */ VOUT_REDRAW_RECT, /* arg1= area rect, res= */
}; };
typedef struct snapshot_t {
char *p_data; /* Data area */
int i_width; /* In pixels */
int i_height; /* In pixels */
int i_datasize; /* In bytes */
mtime_t date; /* Presentation time */
vlc_cond_t p_condvar;
vlc_mutex_t p_mutex;
} snapshot_t;
/**@}*/ /**@}*/
#endif /* _VLC_VIDEO_H */ #endif /* _VLC_VIDEO_H */
...@@ -95,6 +95,16 @@ vlc_module_end () ...@@ -95,6 +95,16 @@ vlc_module_end ()
/***************************************************************************** /*****************************************************************************
* vout_sys_t: video output descriptor * vout_sys_t: video output descriptor
*****************************************************************************/ *****************************************************************************/
typedef struct snapshot_t
{
uint8_t *p_data; /* Data area */
int i_width; /* In pixels */
int i_height; /* In pixels */
int i_datasize; /* In bytes */
mtime_t date; /* Presentation time */
} snapshot_t;
struct vout_sys_t struct vout_sys_t
{ {
snapshot_t **p_list; /* List of available snapshots */ snapshot_t **p_list; /* List of available snapshots */
...@@ -273,7 +283,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -273,7 +283,7 @@ static int Init( vout_thread_t *p_vout )
p_snapshot->i_height = i_height; p_snapshot->i_height = i_height;
p_snapshot->i_datasize = i_datasize; p_snapshot->i_datasize = i_datasize;
p_snapshot->date = 0; p_snapshot->date = 0;
p_snapshot->p_data = ( char* ) malloc( i_datasize ); p_snapshot->p_data = malloc( i_datasize );
if( p_snapshot->p_data == NULL ) if( p_snapshot->p_data == NULL )
{ {
free( p_snapshot ); free( p_snapshot );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment