RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25408 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2007-12-15 13:37:41 +00:00
parent a9d2f4db42
commit 22d9f6ea0c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stream/dvbin.h
View File

@ -97,7 +97,6 @@ typedef struct {
dvb_channels_list *list; dvb_channels_list *list;
int tuner_type; int tuner_type;
int is_on; int is_on;
stream_t *stream;
int retry; int retry;
int timeout; int timeout;
int last_freq; int last_freq;

7
stream/stream_dvb.c
View File

@ -626,11 +626,11 @@ static void dvbin_close(stream_t *stream)
} }
static int dvb_streaming_start(dvb_priv_t *priv, struct stream_priv_s *opts, int tuner_type, char *progname) static int dvb_streaming_start(stream_t *stream, struct stream_priv_s *opts, int tuner_type, char *progname)
{ {
int i; int i;
dvb_channel_t *channel = NULL; dvb_channel_t *channel = NULL;
stream_t *stream = (stream_t*) priv->stream; dvb_priv_t *priv = stream->priv;
mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, VID: %d, AID: %d, TYPE: %s, FILE: %s)\r\n", mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, VID: %d, AID: %d, TYPE: %s, FILE: %s)\r\n",
opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file); opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file);
@ -691,7 +691,6 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
return STREAM_ERROR; return STREAM_ERROR;
priv = (dvb_priv_t *)stream->priv; priv = (dvb_priv_t *)stream->priv;
priv->stream = stream;
priv->config = dvb_get_config(); priv->config = dvb_get_config();
if(priv->config == NULL) if(priv->config == NULL)
{ {
@ -741,7 +740,7 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
progname = p->prog; progname = p->prog;
if(! dvb_streaming_start(priv, p, tuner_type, progname)) if(! dvb_streaming_start(stream, p, tuner_type, progname))
{ {
free(stream->priv); free(stream->priv);
stream->priv = NULL; stream->priv = NULL;