Commit e00e13db authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

V4L2: error handling

confere posix_memalign documentation
parent a02d4d68
...@@ -1761,32 +1761,25 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size ) ...@@ -1761,32 +1761,25 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size )
if( ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 ) if( ioctl( i_fd, VIDIOC_REQBUFS, &req ) < 0 )
{ {
msg_Err( p_demux, "device does not support user pointer i/o" ); msg_Err( p_demux, "device does not support user pointer i/o" );
goto open_failed; return VLC_EGENERIC;
} }
p_sys->p_buffers = calloc( 4, sizeof( *p_sys->p_buffers ) ); p_sys->p_buffers = calloc( 4, sizeof( *p_sys->p_buffers ) );
if( !p_sys->p_buffers ) if( !p_sys->p_buffers )
{
msg_Err( p_demux, "Out of memory" );
goto open_failed; goto open_failed;
}
for( p_sys->i_nbuffers = 0; p_sys->i_nbuffers < 4; ++p_sys->i_nbuffers ) for( p_sys->i_nbuffers = 0; p_sys->i_nbuffers < 4; ++p_sys->i_nbuffers )
{ {
p_sys->p_buffers[p_sys->i_nbuffers].length = i_buffer_size; p_sys->p_buffers[p_sys->i_nbuffers].length = i_buffer_size;
posix_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].start, if( posix_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].start,
/* boundary */ i_page_size, i_buffer_size ); /* boundary */ i_page_size, i_buffer_size ) )
if( !p_sys->p_buffers[p_sys->i_nbuffers].start )
{
msg_Err( p_demux, "out of memory" );
goto open_failed; goto open_failed;
} }
}
return VLC_SUCCESS; return VLC_SUCCESS;
open_failed: open_failed:
free( p_sys->p_buffers );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
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