Skip to content

V
vlc-2-2
Commit 1828f4b9 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Compile fix to check for ffmpeg version.

parent 4e0a6553
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
modules/codec/ffmpeg/mux.c
View file @ 1828f4b9
...@@ -148,7 +148,11 @@ int E_(OpenMux)( vlc_object_t *p_this ) ...@@ -148,7 +148,11 @@ int E_(OpenMux)( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
p_sys->oc->pb = &p_sys->io; p_sys->oc->pb = &p_sys->io;
#else
p_sys->oc->pb = p_sys->io;
#endif
p_sys->oc->nb_streams = 0; p_sys->oc->nb_streams = 0;
p_sys->b_write_header = VLC_TRUE; p_sys->b_write_header = VLC_TRUE;
...@@ -394,7 +398,11 @@ static int Mux( sout_mux_t *p_mux ) ...@@ -394,7 +398,11 @@ static int Mux( sout_mux_t *p_mux )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
put_flush_packet( p_sys->oc->pb ); put_flush_packet( p_sys->oc->pb );
#else
put_flush_packet( &p_sys->oc->pb );
#endif
p_sys->b_write_header = VLC_FALSE; p_sys->b_write_header = VLC_FALSE;
} }
......
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