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

Remove VLC_OBJECT_ENCODER

parent 0d646a30
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#define VLC_OBJECT_DECODER (-8) #define VLC_OBJECT_DECODER (-8)
#define VLC_OBJECT_VOUT (-9) #define VLC_OBJECT_VOUT (-9)
#define VLC_OBJECT_AOUT (-10) #define VLC_OBJECT_AOUT (-10)
#define VLC_OBJECT_ENCODER (-14)
/* Please add new object types below -34 */ /* Please add new object types below -34 */
/* Please do not add new object types anyway */ /* Please do not add new object types anyway */
#define VLC_OBJECT_GENERIC (-666) #define VLC_OBJECT_GENERIC (-666)
......
...@@ -93,7 +93,6 @@ static int vlc_object_type_from_string( const char *psz_name ) ...@@ -93,7 +93,6 @@ static int vlc_object_type_from_string( const char *psz_name )
{ VLC_OBJECT_DECODER, "decoder" }, { VLC_OBJECT_DECODER, "decoder" },
{ VLC_OBJECT_VOUT, "vout" }, { VLC_OBJECT_VOUT, "vout" },
{ VLC_OBJECT_AOUT, "aout" }, { VLC_OBJECT_AOUT, "aout" },
{ VLC_OBJECT_ENCODER, "encoder" },
{ VLC_OBJECT_GENERIC, "generic" }, { VLC_OBJECT_GENERIC, "generic" },
{ 0, "" } }; { 0, "" } };
int i; int i;
......
...@@ -156,7 +156,7 @@ object.find( object, type, mode ): Find an object of given type. mode can ...@@ -156,7 +156,7 @@ object.find( object, type, mode ): Find an object of given type. mode can
"object"'s children. If set to "anywhere", it will look in all the "object"'s children. If set to "anywhere", it will look in all the
objects. If object is unset, the current module's object will be used. objects. If object is unset, the current module's object will be used.
Type can be: "libvlc", "playlist", "input", "decoder", Type can be: "libvlc", "playlist", "input", "decoder",
"vout", "aout", "packetizer", "encoder", "generic". "vout", "aout", "packetizer", "generic".
This function is deprecated and slow and should be avoided. This function is deprecated and slow and should be avoided.
object.find_name( object, name, mode ): Same as above except that it matches object.find_name( object, name, mode ): Same as above except that it matches
on the object's name and not type. This function is also slow and should on the object's name and not type. This function is also slow and should
......
...@@ -331,6 +331,7 @@ sout_AccessOutSeek ...@@ -331,6 +331,7 @@ sout_AccessOutSeek
sout_AccessOutWrite sout_AccessOutWrite
sout_AnnounceRegisterSDP sout_AnnounceRegisterSDP
sout_AnnounceUnRegister sout_AnnounceUnRegister
sout_EncoderCreate
sout_MethodRelease sout_MethodRelease
sout_MuxAddStream sout_MuxAddStream
sout_MuxDelete sout_MuxDelete
......
...@@ -231,10 +231,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) ...@@ -231,10 +231,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
i_size = sizeof(decoder_t); i_size = sizeof(decoder_t);
psz_type = "packetizer"; psz_type = "packetizer";
break; break;
case VLC_OBJECT_ENCODER:
i_size = sizeof(encoder_t);
psz_type = "encoder";
break;
case VLC_OBJECT_AOUT: case VLC_OBJECT_AOUT:
i_size = sizeof(aout_instance_t); i_size = sizeof(aout_instance_t);
psz_type = "audio output"; psz_type = "audio output";
......
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