[vlc-commits] input/demux: rename demux_FromContentType

Filip Roséen git at videolan.org
Tue Aug 2 15:47:21 CEST 2016


vlc | branch: master | Filip Roséen <filip at atch.se> | Sat Jul 30 04:30:26 2016 +0200| [1abff05b01c48d1780b65417aae17f8e682ff066] | committer: Jean-Baptiste Kempf

input/demux: rename demux_FromContentType

The previous function-name implied that the function would return a
pointer-to-demux_t, and not the name of a demuxer.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1abff05b01c48d1780b65417aae17f8e682ff066
---

 src/input/demux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index 90007565..2d854a3 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -52,7 +52,7 @@ static int typecmp( const void *k, const void *t )
     return vlc_ascii_strcasecmp( key, type->type );
 }
 
-static const char *demux_FromContentType(const char *mime)
+static const char *demux_NameFromContentType(const char *mime)
 {
     static const struct demux_type types[] =
     {   /* Must be sorted in ascending ASCII order */
@@ -132,7 +132,7 @@ demux_t *demux_NewAdvanced( vlc_object_t *p_obj, input_thread_t *p_parent_input,
         char *type = stream_ContentType( s );
         if( type != NULL )
         {
-            psz_demux = demux_FromContentType( type );
+            psz_demux = demux_NameFromContentType( type );
             free( type );
         }
     }



More information about the vlc-commits mailing list