vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Oct 10 23:04:24 2014 +0300| [932e8a8b2f941cb399fdd491bb13feb9e42ac021] | committer: Rémi Denis-Courmont
sout_standard: fix inverted logic Regression from c9d33a6123bb499cce31b4cf469ae40e8c9e9b6c. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=932e8a8b2f941cb399fdd491bb13feb9e42ac021 --- modules/stream_out/standard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 03d7336..a386801 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -306,7 +306,7 @@ static void checkAccessMux( sout_stream_t *p_stream, char *psz_access, { if( exactMatch( psz_access, "mmsh", 4 ) && !exactMatch( psz_mux, "asfh", 4 ) ) msg_Err( p_stream, "mmsh output is only valid with asfh mux" ); - else if( exactMatch( psz_access, "file", 4 ) && + else if( !exactMatch( psz_access, "file", 4 ) && ( exactMatch( psz_mux, "mov", 3 ) || exactMatch( psz_mux, "mp4", 3 ) ) ) msg_Err( p_stream, "mov and mp4 mux are only valid with file output" ); else if( exactMatch( psz_access, "udp", 3 ) ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
