Skip to content

V
vlc-1.1
Commit 4ab00739 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Use standard memory management functions

parent a82fd8f9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
modules/access/v4l2/v4l2.c
View file @ 4ab00739
...@@ -515,7 +515,6 @@ struct buffer_t ...@@ -515,7 +515,6 @@ struct buffer_t
{ {
void * start; void * start;
size_t length; size_t length;
void * orig_userp;
}; };
struct demux_sys_t struct demux_sys_t
...@@ -1128,7 +1127,7 @@ static void DemuxClose( vlc_object_t *p_this ) ...@@ -1128,7 +1127,7 @@ static void DemuxClose( vlc_object_t *p_this )
case IO_METHOD_USERPTR: case IO_METHOD_USERPTR:
for( i = 0; i < p_sys->i_nbuffers; ++i ) for( i = 0; i < p_sys->i_nbuffers; ++i )
{ {
free( p_sys->p_buffers[i].orig_userp ); free( p_sys->p_buffers[i].start );
} }
break; break;
} }
...@@ -1756,7 +1755,7 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size ) ...@@ -1756,7 +1755,7 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size )
struct v4l2_requestbuffers req; struct v4l2_requestbuffers req;
unsigned int i_page_size; unsigned int i_page_size;
i_page_size = getpagesize(); i_page_size = sysconf(_SC_PAGESIZE);
i_buffer_size = ( i_buffer_size + i_page_size - 1 ) & ~( i_page_size - 1); i_buffer_size = ( i_buffer_size + i_page_size - 1 ) & ~( i_page_size - 1);
memset( &req, 0, sizeof(req) ); memset( &req, 0, sizeof(req) );
...@@ -1780,8 +1779,7 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size ) ...@@ -1780,8 +1779,7 @@ static int InitUserP( demux_t *p_demux, int i_fd, unsigned int i_buffer_size )
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;
p_sys->p_buffers[p_sys->i_nbuffers].start = posix_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].start,
vlc_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].orig_userp,
/* boundary */ i_page_size, i_buffer_size ); /* boundary */ i_page_size, i_buffer_size );
if( !p_sys->p_buffers[p_sys->i_nbuffers].start ) if( !p_sys->p_buffers[p_sys->i_nbuffers].start )
......
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