From c089aa8972b6bcf8c5abee0dfbee526de5775d87 Mon Sep 17 00:00:00 2001 From: Antoine Cellerier Date: Sat, 17 Feb 2007 21:28:05 +0000 Subject: [PATCH] ffmpeg/mux.c: implement MUX_GET_MIME. flash.html: we don't need to force the mime type manualy anymore (in the sout chain). --- modules/codec/ffmpeg/mux.c | 6 ++++++ share/http/flash.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/codec/ffmpeg/mux.c b/modules/codec/ffmpeg/mux.c index 9350d26549..2d616846b8 100644 --- a/modules/codec/ffmpeg/mux.c +++ b/modules/codec/ffmpeg/mux.c @@ -428,6 +428,12 @@ static int Control( sout_mux_t *p_mux, int i_query, va_list args ) return VLC_SUCCESS; case MUX_GET_MIME: + { + char **ppsz = (char**)va_arg( args, char ** ); + *ppsz = strdup( p_mux->p_sys->oc->oformat->mime_type ); + return VLC_SUCCESS; + } + default: return VLC_EGENERIC; } diff --git a/share/http/flash.html b/share/http/flash.html index d33076adc0..fbfbef241a 100644 --- a/share/http/flash.html +++ b/share/http/flash.html @@ -23,7 +23,7 @@ host = document.location.toString().replace( /http:\/\//, '' ).replace( /[:/].*/ - +
-- 2.39.2