vlc | branch: master | Rafaël Carré <[email protected]> | Sun Jan 29 01:18:38 2012 -0500| [f610ab9f732b7764596b5ac559893b3993e1d9bd] | committer: Rafaël Carré
Workaround FFmpeg doc/APIchanges lies > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f610ab9f732b7764596b5ac559893b3993e1d9bd --- modules/demux/avformat/demux.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c index 902f578..23907cf 100644 --- a/modules/demux/avformat/demux.c +++ b/modules/demux/avformat/demux.c @@ -242,7 +242,7 @@ int OpenDemux( vlc_object_t *p_this ) } vlc_avcodec_lock(); /* avformat calls avcodec behind our back!!! */ -#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0) +#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(26<<8)+0) error = avformat_find_stream_info( p_sys->ic, NULL /* options */ ); #else error = av_find_stream_info( p_sys->ic ); @@ -528,7 +528,7 @@ void CloseDemux( vlc_object_t *p_this ) free( p_sys->tk_pcr ); if( p_sys->ic ) -#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0) +#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(26<<8)+0) avformat_close_input( &p_sys->ic ); #else av_close_input_stream( p_sys->ic ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
