Commit 4448a185 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix bugs in loading of audio transcoding filters.exit

parent 0c0c6795
...@@ -431,7 +431,10 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -431,7 +431,10 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
if ( p_sys->i_height || p_sys->i_width ) if ( p_sys->i_height || p_sys->i_width )
{ {
video_format_t fmt_out = {0}, fmt_in = {0}; video_format_t fmt_out, fmt_in;
memset( &fmt_in, 0, sizeof(video_format_t) );
memset( &fmt_out, 0, sizeof(video_format_t) );
fmt_in = p_sys->p_decoder->fmt_out.video; fmt_in = p_sys->p_decoder->fmt_out.video;
fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
......
...@@ -651,7 +651,7 @@ static void NetCommand( sout_stream_t *p_stream ) ...@@ -651,7 +651,7 @@ static void NetCommand( sout_stream_t *p_stream )
{ {
sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_sys_t *p_sys = p_stream->p_sys;
char psz_buffer[10]; char psz_buffer[10];
int i_len = net_ReadNonBlock( p_stream, p_sys->i_fd, NULL, psz_buffer, int i_len = net_ReadNonBlock( p_stream, p_sys->i_fd, NULL, (char *)&psz_buffer[0],
sizeof( psz_buffer ), 0 ); sizeof( psz_buffer ), 0 );
if ( i_len > 0 ) if ( i_len > 0 )
...@@ -847,7 +847,7 @@ static block_t *VideoGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -847,7 +847,7 @@ static block_t *VideoGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
int mb_height = (id->ff_enc_c->height + 15) / 16; int mb_height = (id->ff_enc_c->height + 15) / 16;
int h_chroma_shift, v_chroma_shift; int h_chroma_shift, v_chroma_shift;
int i; int i;
avcodec_get_chroma_sub_sample( id->ff_enc_c->pix_fmt, &h_chroma_shift, avcodec_get_chroma_sub_sample( id->ff_enc_c->pix_fmt, &h_chroma_shift,
&v_chroma_shift ); &v_chroma_shift );
...@@ -859,7 +859,7 @@ static block_t *VideoGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -859,7 +859,7 @@ static block_t *VideoGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
id->ff_enc_c->coded_frame->mb_type, id->ff_enc_c->coded_frame->mb_type,
(mb_width + 1) * mb_height (mb_width + 1) * mb_height
* sizeof(id->p_frame->mb_type[0])); * sizeof(id->p_frame->mb_type[0]));
for ( i = 0; i < 2; i++ ) for ( i = 0; i < 2; i++ )
{ {
int stride = ((16 * mb_width ) int stride = ((16 * mb_width )
...@@ -942,4 +942,3 @@ static block_t *AudioGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -942,4 +942,3 @@ static block_t *AudioGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
return p_out; return p_out;
} }
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