Let swscale handle video conversion when available (close #1695)

[vlc] / modules / access / dvb / en50221.c

diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c
index d8da6461af150d3b2539960f0faba23cf8c900fd..9a78e97f0f7202fb36c5195a2482f43da96d3765 100644 (file)
--- a/modules/access/dvb/en50221.c
+++ b/modules/access/dvb/en50221.c
@@ -1910,7 +1910,7 @@ int en50221_Init( access_t * p_access )
 #if HLCI_WAIT_CAM_READY
         while( ca_msg.msg[8] == 0xff && ca_msg.msg[9] == 0xff )
         {
-            if( p_access->b_die ) return VLC_EGENERIC;
+            if( !vlc_object_alive (p_access) ) return VLC_EGENERIC;
             msleep(1);
             msg_Dbg( p_access, "CAM: please wait" );
             APDUSend( p_access, 1, AOT_APPLICATION_INFO_ENQ, NULL, 0 );
@@ -2320,8 +2320,8 @@ static inline void *FixUTF8( char *p )
 
 static char *dvbsi_to_utf8( char *psz_instring, size_t i_length )
 {
-    const char *psz_encoding;
-    char *psz_stringstart, *psz_outstring, *psz_tmp;
+    const char *psz_encoding, *psz_stringstart;
+    char *psz_outstring, *psz_tmp;
     char psz_encbuf[12];
     size_t i_in, i_out;
     vlc_iconv_t iconv_handle;