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/stream_pvr.c | |
| 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/stream_pvr.c')
| -rw-r--r-- | stream/stream_pvr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c index aeea46cf62..6038ee9221 100644 --- a/stream/stream_pvr.c +++ b/stream/stream_pvr.c @@ -40,14 +40,15 @@ #include <linux/types.h> #include <linux/videodev2.h> +#include <libavutil/common.h> +#include <libavutil/avstring.h> + #include "core/mp_msg.h" #include "stream.h" #include "pvr.h" #include "frequencies.h" -#include "libavutil/common.h" -#include "libavutil/avstring.h" #define PVR_DEFAULT_DEVICE "/dev/video0" #define PVR_MAX_CONTROLS 10 @@ -1555,7 +1556,7 @@ pvr_stream_read (stream_t *stream, char *buffer, int size) } static int -pvr_stream_open (stream_t *stream, int mode, void *opts, int *file_format) +pvr_stream_open (stream_t *stream, int mode, void *opts) { struct v4l2_capability vcap; struct v4l2_ext_controls ctrls; @@ -1756,10 +1757,7 @@ pvr_force_freq_step (stream_t *stream, int step) } const stream_info_t stream_info_pvr = { - "V4L2 MPEG Input (a.k.a PVR)", "pvr", - "Benjamin Zores", - "", pvr_stream_open, { "pvr", NULL }, NULL, |