comparison subreader.c @ 10353:ee46cdf03028

small correction of sub_utf8 restoring between reading sub files

10352:536f3ea8d19d

    };
    struct subreader *srp;
    
    if(filename==NULL) return NULL; //qnx segfault
    fd=fopen (filename, "r"); if (!fd) return NULL;
    {
	    int l;
	    if ((l=strlen(filename))>4){
		    int k;
		    char *exts[] = {".utf", ".utf8", ".utf-8" };

			    sub_utf8 = 1;
			    break;
			}
	    }
    }
    sub_format=sub_autodetect (fd, &uses_time);
    mpsub_multiplier = (uses_time ? 100.0 : 1.0);
    if (sub_format==SUB_INVALID) {mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: Could not determine file format\n");return NULL;}
    srp=sr+sub_format;
    mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Detected subtitle file format: %s\n", srp->name);
    
    rewind (fd);

#ifdef USE_ICONV
    sub_utf8_prev=sub_utf8;
    subcp_open();
#endif

    sub_num=0;n_max=32;
    first=(subtitle *)malloc(n_max*sizeof(subtitle));
    if(!first) return NULL;

10353:ee46cdf03028

    };
    struct subreader *srp;
    
    if(filename==NULL) return NULL; //qnx segfault
    fd=fopen (filename, "r"); if (!fd) return NULL;
    
    sub_format=sub_autodetect (fd, &uses_time);
    mpsub_multiplier = (uses_time ? 100.0 : 1.0);
    if (sub_format==SUB_INVALID) {mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: Could not determine file format\n");return NULL;}
    srp=sr+sub_format;
    mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Detected subtitle file format: %s\n", srp->name);
    
    rewind (fd);

#ifdef USE_ICONV
    sub_utf8_prev=sub_utf8;
    {
	    int l;
	    if ((l=strlen(filename))>4){
		    int k;
		    char *exts[] = {".utf", ".utf8", ".utf-8" };

			    sub_utf8 = 1;
			    break;
			}
	    }
    }
    if (!(sub_utf8 & 1)) subcp_open();
#endif

    sub_num=0;n_max=32;
    first=(subtitle *)malloc(n_max*sizeof(subtitle));
    if(!first) return NULL;