Unified · Split
| @@ -38,8 +38,6 @@ Sopen(char *filename, int *num) · 37 unmodified lines | |||
| 38 | void | 38 | void |
| 39 | Sclose(Stream *s) | 39 | Sclose(Stream *s) |
| 40 | { | 40 | { |
| 41 | if(s->pid > 0) | ||
| 42 | postnote(PNPROC, s->pid, "interrupt"); | ||
| 43 | s->ops.close(s); | 41 | s->ops.close(s); |
| 44 | } | 42 | } |
| 45 | 43 | ||
| @@ -63,7 +63,6 @@ struct Stream { · 62 unmodified lines | |||
| 63 | void *b; | 63 | void *b; |
| 64 | u8int *buf; | 64 | u8int *buf; |
| 65 | int bufsz; | 65 | int bufsz; |
| 66 | int pid; | ||
| 67 | }; | 66 | }; |
| 68 | 67 | ||
| 69 | Stream *Sopen(char *filename, int *num); | 68 | Stream *Sopen(char *filename, int *num); |
| @@ -16,6 +16,7 @@ mcfs(char **argv, int *pipefd) · 15 unmodified lines | |||
| 16 | pipe(p); | 16 | pipe(p); |
| 17 | if((pid = rfork(RFFDG|RFPROC|RFNOMNT)) == 0){ | 17 | if((pid = rfork(RFFDG|RFPROC|RFNOMNT)) == 0){ |
| 18 | close(0); | 18 | close(0); |
| 19 | close(p[0]); | ||
| 19 | dup(p[1], 1); close(p[1]); | 20 | dup(p[1], 1); close(p[1]); |
| 20 | if(!debug){ | 21 | if(!debug){ |
| 21 | dup(fd = open("/dev/null", OWRITE), 2); | 22 | dup(fd = open("/dev/null", OWRITE), 2); |
| @@ -65,7 +66,7 @@ mp4open(char *filename, int *num, int *failed) · 43 unmodified lines | |||
| 65 | s = streams+ns; | 66 | s = streams+ns; |
| 66 | 67 | ||
| 67 | if(nvideo < 1 && strcmp(v[1], "video") == 0){ | 68 | if(nvideo < 1 && strcmp(v[1], "video") == 0){ |
| 68 | if((s->pid = mcfs(argv, &sp)) > 0 && ivfopenb(Bfdopen(sp, OREAD), s, failed) == 0){ | 69 | if(mcfs(argv, &sp) > 0 && ivfopenb(Bfdopen(sp, OREAD), s, failed) == 0){ |
| 69 | nvideo++; | 70 | nvideo++; |
| 70 | ns++; | 71 | ns++; |
| 71 | } | 72 | } |