ogg demux: fill i_physical_channels

[vlc] / include / vlc_avcodec.h

diff --git a/include/vlc_avcodec.h b/include/vlc_avcodec.h
index fc5a3a99bd3215043a5b293cb612d8ae97fd1ef2..dc7b41607a661db6168b256cccfeee81cba5c3d5 100644 (file)
--- a/include/vlc_avcodec.h
+++ b/include/vlc_avcodec.h
@@ -1,36 +1,34 @@
 /*****************************************************************************
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #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