vlc | branch: master | Rafaël Carré <[email protected]> | Wed Sep 7 09:46:08 2016 +0200| [454bff6025b6a27346ab7d8f8e0844c9ebf6bd12] | committer: Rafaël Carré
avformat mux: fix version check > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=454bff6025b6a27346ab7d8f8e0844c9ebf6bd12 --- modules/demux/avformat/mux.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c index e2df0f1..9072c2f 100644 --- a/modules/demux/avformat/mux.c +++ b/modules/demux/avformat/mux.c @@ -61,7 +61,7 @@ struct sout_mux_sys_t bool b_write_header; bool b_write_keyframe; bool b_error; -#if LIBAVCODEC_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) bool b_header_done; #endif }; @@ -76,7 +76,7 @@ static int Mux ( sout_mux_t * ); static int IOWrite( void *opaque, uint8_t *buf, int buf_size ); static int64_t IOSeek( void *opaque, int64_t offset, int whence ); -#if LIBAVCODEC_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, enum AVIODataMarkerType type, int64_t time); #endif @@ -144,7 +144,7 @@ int OpenMux( vlc_object_t *p_this ) p_sys->b_write_header = true; p_sys->b_write_keyframe = false; p_sys->b_error = false; -#if LIBAVCODEC_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) p_sys->io->write_data_type = IOWriteTyped; p_sys->b_header_done = false; #endif @@ -373,7 +373,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) return VLC_SUCCESS; } -#if LIBAVCODEC_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size, enum AVIODataMarkerType type, int64_t time) { @@ -490,7 +490,7 @@ static int IOWrite( void *opaque, uint8_t *buf, int buf_size ) if( p_sys->b_write_header ) p_buf->i_flags |= BLOCK_FLAG_HEADER; -#if LIBAVCODEC_VERSION_CHECK( 57, 7, 0, 40, 100 ) +#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 ) if( !p_sys->b_header_done ) p_buf->i_flags |= BLOCK_FLAG_HEADER; #endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
