[vlc-commits] dvb: remove psz_demux hack

[Edward Wang]

vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sun Oct 27 00:39:24 2013 -0400| [e58236de0c3bce8dc428273bb08c661b6d67d4d8] | committer: Rémi Denis-Courmont

dvb: remove psz_demux hack

Ref #8449

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

 modules/access/dvb/access.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index df89f37..cb966b7 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -172,8 +172,6 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* Set up access */
-    free( p_access->psz_demux );
-    p_access->psz_demux = strdup( "m3u8" );
     p_access->pf_read = NULL;
     p_access->pf_control = Control;
     p_access->pf_seek = NULL;
@@ -373,6 +371,10 @@ static int Control( access_t *p_access, int i_query, va_list args )
             *pb_bool = false;
             break;
 
+        case ACCESS_GET_CONTENT_TYPE:
+            *va_arg( args, char** ) = strdup("application/vnd.apple.mpegurl"); // m3u8
+            return VLC_SUCCESS;
+
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = DEFAULT_PTS_DELAY;