Skip to content

V
vlc-2-2
Commit 0e05b6e2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

avformat: lock avcodec 

This is ugly but we can do jack about this (short of forking ffmpeg).
parent bf7164b7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/demux/avformat/demux.c
View file @ 0e05b6e2
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <vlc_meta.h> #include <vlc_meta.h>
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_charset.h> #include <vlc_charset.h>
#include <vlc_avcodec.h>
/* ffmpeg header */ /* ffmpeg header */
#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) #if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
...@@ -205,13 +206,16 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -205,13 +206,16 @@ int OpenDemux( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
vlc_avcodec_lock(); /* avformat calls avcodec behind our back!!! */
if( av_find_stream_info( p_sys->ic ) < 0 ) if( av_find_stream_info( p_sys->ic ) < 0 )
{ {
vlc_avcodec_unlock();
msg_Err( p_demux, "av_find_stream_info failed" ); msg_Err( p_demux, "av_find_stream_info failed" );
if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE; if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
CloseDemux( p_this ); CloseDemux( p_this );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
vlc_avcodec_unlock();
if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE; if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
for( i = 0; i < p_sys->ic->nb_streams; i++ ) for( i = 0; i < p_sys->ic->nb_streams; i++ )
......
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