Mercurial > mplayer.hg
annotate libmpdemux/stream_null.c @ 18066:2ee39341b7a6
fix segfault in the skin browser when sbSelectedSkin gets dereferenced before setting, when no skin is selected in the skin list upon opening the browser,
and "Cancel" or "OK" buttons get clicked.
Noticed when runnig freshly compiled gmplayer on a system where the skins were still under the old location.
based on a combined patch by Stanislav Maslovski <stanislav POIS maslovski AH gmail POIS com>
author | gpoirier |
---|---|
date | Sun, 09 Apr 2006 13:52:45 +0000 |
parents | 233802490b0e |
children |
rev | line source |
---|---|
9901
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
1 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
2 #include "config.h" |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
3 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
4 #include <stdlib.h> |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
5 #include <string.h> |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
6 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
7 #include "stream.h" |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
8 #include "demuxer.h" |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
9 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
10 #ifdef USE_TV |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
11 extern char* tv_param_channel; |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
12 #endif |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
13 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
14 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
15 static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
16 stream->type = STREAMTYPE_DUMMY; |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
17 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
18 if(strncmp("mf://",stream->url,5) == 0) { |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
19 *file_format = DEMUXER_TYPE_MF; |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
20 } |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
21 #ifdef USE_TV |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
22 else if (strncmp("tv://",stream->url,5) == 0) { |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
23 *file_format = DEMUXER_TYPE_TV; |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
24 if(stream->url[5] != '\0') |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
25 tv_param_channel = strdup(stream->url + 5); |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
26 } |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
27 #endif |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
28 return 1; |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
29 } |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
30 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
31 |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
32 stream_info_t stream_info_null = { |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
33 "Null stream", |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
34 "null", |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
35 "Albeu", |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
36 "", |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
37 open_s, |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
38 { |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
39 #ifdef USE_TV |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
40 "tv", |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
41 #endif |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
42 "mf", "null", NULL }, |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
43 NULL, |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
44 0 // Urls are an option string |
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
diff
changeset
|
45 }; |