diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:01:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:01:15 +0200 |
commit | 0dce155dd3e52d24c7a0ffbd4be9461170d53de3 (patch) | |
tree | 0d675e2bbd3fa90303f72708b8533d5d068278f4 /libvo | |
parent | db7fe7ce92a229c6529b9b6b2894f325a778ead2 (diff) | |
parent | 22e310b9aef77477e022874beb388514911ead1e (diff) | |
download | mpv-0dce155dd3e52d24c7a0ffbd4be9461170d53de3.tar.bz2 mpv-0dce155dd3e52d24c7a0ffbd4be9461170d53de3.tar.xz |
Merge svn changes up to r30694
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_v4l2.c | 1 | ||||
-rw-r--r-- | libvo/vo_v4l2.h | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/libvo/vo_v4l2.c b/libvo/vo_v4l2.c index bb21096b8d..d1ee15ca3b 100644 --- a/libvo/vo_v4l2.c +++ b/libvo/vo_v4l2.c @@ -42,6 +42,7 @@ #include "video_out.h" #include "video_out_internal.h" #include "libmpdemux/mpeg_packetizer.h" +#include "vo_v4l2.h" #define DEFAULT_MPEG_DECODER "/dev/video16" #define V4L2_VO_HDR "VO: [v4l2]" diff --git a/libvo/vo_v4l2.h b/libvo/vo_v4l2.h new file mode 100644 index 0000000000..ac44fcaa75 --- /dev/null +++ b/libvo/vo_v4l2.h @@ -0,0 +1,28 @@ +/* + * video output for V4L2 hardware MPEG decoders + * + * Copyright (C) 2007 Benjamin Zores + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_VO_V4L2_H +#define MPLAYER_VO_V4L2_H + +int v4l2_write(const unsigned char *data, int len); + +#endif /* MPLAYER_VO_V4L2_H */ |