Skip to content

V
vlc
Commit 704ff6e2 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/codec/x264.c: compilation fix for new libx264.

parent 49151c07
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
modules/codec/x264.c
View file @ 704ff6e2
...@@ -360,12 +360,10 @@ static int Open ( vlc_object_t *p_this ) ...@@ -360,12 +360,10 @@ static int Open ( vlc_object_t *p_this )
static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
{ {
encoder_sys_t *p_sys = p_enc->p_sys; encoder_sys_t *p_sys = p_enc->p_sys;
x264_picture_t pic; x264_picture_t pic;
int i_nal;
x264_nal_t *nal; x264_nal_t *nal;
block_t *p_block; block_t *p_block;
int i_out; int i_nal, i_out, i;
int i;
/* init pic */ /* init pic */
memset( &pic, 0, sizeof( x264_picture_t ) ); memset( &pic, 0, sizeof( x264_picture_t ) );
...@@ -377,7 +375,11 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) ...@@ -377,7 +375,11 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
pic.img.i_stride[i] = p_pict->p[i].i_pitch; pic.img.i_stride[i] = p_pict->p[i].i_pitch;
} }
#if X264_BUILD >= 0x0013
x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic, &pic );
#else
x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic ); x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic );
#endif
for( i = 0, i_out = 0; i < i_nal; i++ ) for( i = 0, i_out = 0; i < i_nal; i++ )
{ {
int i_size = p_sys->i_buffer - i_out; int i_size = p_sys->i_buffer - i_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