[vlc-commits] Workaround FFmpeg doc/APIchanges lies ( cherry picked from commit 5b55c4dbab0ee2700300f9d8b79747a42ef26158)

Rafaël Carré git at videolan.org
Sun Mar 4 22:42:02 CET 2012


vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Sat Mar  3 00:03:05 2012 +0900| [ece5edec14b02637ce69d8a479a1755d86bf0037] | committer: Rafaël Carré

Workaround FFmpeg doc/APIchanges lies (cherry picked from commit 5b55c4dbab0ee2700300f9d8b79747a42ef26158)

Signed-off-by: KO Myung-Hun <komh at chollian.net>
Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ece5edec14b02637ce69d8a479a1755d86bf0037
---

 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 dff8a08..357f46c 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -251,7 +251,7 @@ int OpenDemux( vlc_object_t *p_this )
     psz_url = NULL;
 
     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 );
@@ -537,7 +537,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 );



More information about the vlc-commits mailing list