diff options
| author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
| commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
| tree | 199bddd30923db1175a1331191eb86ba684e9e41 /stream/tv.h | |
| parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
| parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
| download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz | |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
Diffstat (limited to 'stream/tv.h')
| -rw-r--r-- | stream/tv.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/stream/tv.h b/stream/tv.h index 660a78be7b..ded9ace6c8 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -25,8 +25,6 @@ #ifndef MPLAYER_TV_H #define MPLAYER_TV_H -#include "demux/demux.h" - typedef struct tv_param_s { char *freq; char *channel; @@ -105,7 +103,7 @@ typedef struct tvi_handle_s { const tvi_functions_t *functions; void *priv; int seq; - demuxer_t *demuxer; + struct demuxer *demuxer; /* specific */ int norm; |