[vlc-devel] commit: Protect av_register_all call with vlc_avcodec_lock(). ( Laurent Aimar )

git version control git at videolan.org
Sat Dec 12 19:24:49 CET 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Dec 12 11:12:47 2009 +0100| [1f30a5ff09d8b838f1c154c59b56b9acdddfd08f] | committer: Laurent Aimar 

Protect av_register_all call with vlc_avcodec_lock().

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

 modules/demux/avformat/demux.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 1afdd2a..2e48e42 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -121,7 +121,9 @@ int OpenDemux( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
+    vlc_avcodec_lock();
     av_register_all(); /* Can be called several times */
+    vlc_avcodec_unlock();
 
     /* Guess format */
     if( !( fmt = av_probe_input_format( &pd, 1 ) ) )




More information about the vlc-devel mailing list