Add a centralized avcodec lock

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index afc1dfe470edde617d69425a82fb85e9233091ff..e2fda545a74b1e2f687b8e5728e28c239950f7a4 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -36,7 +36,6 @@
 #define VLC_OBJECT_DECODER     (-8)
 #define VLC_OBJECT_VOUT        (-9)
 #define VLC_OBJECT_AOUT        (-10)
-#define VLC_OBJECT_ENCODER     (-14)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */
 #define VLC_OBJECT_GENERIC     (-666)
@@ -112,25 +111,6 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
     __vlc_list_children( VLC_OBJECT(a) )
 
 /* Objects and threading */
-VLC_EXPORT( void, __vlc_object_lock, ( vlc_object_t * ) );
-#define vlc_object_lock( obj ) \
-    __vlc_object_lock( VLC_OBJECT( obj ) )
-
-VLC_EXPORT( void, __vlc_object_unlock, ( vlc_object_t * ) );
-#define vlc_object_unlock( obj ) \
-    __vlc_object_unlock( VLC_OBJECT( obj ) )
-
-VLC_EXPORT( void, __vlc_object_assert_locked, ( vlc_object_t * ) );
-#define vlc_object_assert_locked( obj ) \
-    __vlc_object_assert_locked( VLC_OBJECT( obj ) )
-
-#if defined (__GNUC__) && !defined __cplusplus
-__attribute__((deprecated))
-#endif
-VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) );
-#define vlc_object_wait( obj ) \
-    __vlc_object_wait( VLC_OBJECT( obj ) )
-
 VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
 #define vlc_object_kill(a) \
     __vlc_object_kill( VLC_OBJECT(a) )