vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Mar 25 23:57:08 2011 +0200| [09da8433d4f2284e0b6bfe52b414bf7ec4bcbc7a] | committer: Rémi Denis-Courmont
DVB: mostly work around variable conflict with the new plugin > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=09da8433d4f2284e0b6bfe52b414bf7ec4bcbc7a --- modules/access/dvb/access.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index b193ef0..884089e 100644 --- a/modules/access/dvb/access.c +++ b/modules/access/dvb/access.c @@ -142,6 +142,11 @@ static int Open( vlc_object_t *p_this ) if( ParseMRL( p_access ) ) { free( p_sys ); + var_Destroy( p_access, "dvb-modulation" ); + var_Destroy( p_access, "dvb-fec" ); + var_Destroy( p_access, "dvb-code-rate-hp" ); + var_Destroy( p_access, "dvb-code-rate-lp" ); + var_Destroy( p_access, "dvb-guard" ); return VLC_EGENERIC; } @@ -487,6 +492,12 @@ static void FilterUnset( access_t *p_access, int i_max ) *****************************************************************************/ static void VarInit( access_t *p_access ) { + var_Destroy( p_access, "dvb-modulation" ); + var_Destroy( p_access, "dvb-fec" ); + var_Destroy( p_access, "dvb-code-rate-hp" ); + var_Destroy( p_access, "dvb-code-rate-lp" ); + var_Destroy( p_access, "dvb-guard" ); + /* */ var_Create( p_access, "dvb-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
