Remove VLC_OBJECT_ENCODER

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index afc1dfe470edde617d69425a82fb85e9233091ff..8edb63e58b242c4677377680ee58d80b0f3254af 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)

diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c
index 6468f9530eb200faff9b414af72494809e7df0a4..950f5fe78752237b057432a11d0d8cb05d4ab99b 100644 (file)
--- a/modules/misc/lua/libs/objects.c
+++ b/modules/misc/lua/libs/objects.c
@@ -93,7 +93,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_DECODER, "decoder" },
           { VLC_OBJECT_VOUT, "vout" },
           { VLC_OBJECT_AOUT, "aout" },
-          { VLC_OBJECT_ENCODER, "encoder" },
           { VLC_OBJECT_GENERIC, "generic" },
           { 0, "" } };
     int i;

diff --git a/share/lua/README.txt b/share/lua/README.txt
index faf59257ec7db204a2e1ca5178f8174c9853f97d..3dd3fc87cf4b6f52b20e79d016455147ad9dbae9 100644 (file)
--- a/share/lua/README.txt
+++ b/share/lua/README.txt
@@ -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
   objects. If object is unset, the current module's object will be used.
   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.
 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

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index c97ff57cbf747e6493e93f114e7578408db491a6..f8275b99190a0aa6031688c7378e998a969aed62 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -331,6 +331,7 @@ sout_AccessOutSeek
 sout_AccessOutWrite
 sout_AnnounceRegisterSDP
 sout_AnnounceUnRegister
+sout_EncoderCreate
 sout_MethodRelease
 sout_MuxAddStream
 sout_MuxDelete

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 350f87ad7753ce9ad1e86fd629303601c64672f3..fa1f69128f3698d3f379ae88986821f58a056214 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -231,10 +231,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(decoder_t);
             psz_type = "packetizer";
             break;
-        case VLC_OBJECT_ENCODER:
-            i_size = sizeof(encoder_t);
-            psz_type = "encoder";
-            break;
         case VLC_OBJECT_AOUT:
             i_size = sizeof(aout_instance_t);
             psz_type = "audio output";