Commit 2a5fa328 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

avcodec: use vlc_global_mutex

parent e3c35026
/*****************************************************************************
* vlc_avcodec.h: VLC thread support for FFMPEG/libavcodec
*****************************************************************************
* Copyright (C) 2009 Rémi Denis-Courmont
* Copyright (C) 2009-2010 Rémi Denis-Courmont
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -21,16 +21,14 @@
#ifndef VLC_AVCODEC_H
# define VLC_AVCODEC_H 1
VLC_EXPORT( void, vlc_avcodec_mutex, (bool) );
static inline void vlc_avcodec_lock (void)
{
vlc_avcodec_mutex (true);
vlc_global_lock (VLC_AVCODEC_MUTEX);
}
static inline void vlc_avcodec_unlock (void)
{
vlc_avcodec_mutex (false);
vlc_global_unlock (VLC_AVCODEC_MUTEX);
}
#endif
......@@ -1967,15 +1967,3 @@ static int ConsoleWidth( void )
return i_width;
}
#include <vlc_avcodec.h>
void vlc_avcodec_mutex (bool acquire)
{
static vlc_mutex_t lock = VLC_STATIC_MUTEX;
if (acquire)
vlc_mutex_lock (&lock);
else
vlc_mutex_unlock (&lock);
}
......@@ -473,7 +473,6 @@ video_format_Setup
video_format_Print
video_splitter_Delete
video_splitter_New
vlc_avcodec_mutex
vlc_b64_decode
vlc_b64_decode_binary
vlc_b64_decode_binary_to_buffer
......
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