Mercurial > mplayer.hg
changeset 30650:6fc02905e992
Add header for v4l2_write() instead of forward declaring it.
author | diego |
---|---|
date | Sun, 21 Feb 2010 23:31:56 +0000 |
parents | 77cc0ca2c757 |
children | d3182b1cd1ce |
files | libao2/ao_v4l2.c libvo/vo_v4l2.c libvo/vo_v4l2.h |
diffstat | 3 files changed, 30 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_v4l2.c Sun Feb 21 23:30:34 2010 +0000 +++ b/libao2/ao_v4l2.c Sun Feb 21 23:31:56 2010 +0000 @@ -33,6 +33,7 @@ #include "audio_out_internal.h" #include "libaf/af_format.h" #include "libmpdemux/mpeg_packetizer.h" +#include "libvo/vo_v4l2.h" #define MPEG_AUDIO_ID 0x1C0 @@ -144,8 +145,6 @@ static int play (void *data, int len, int flags) { - int v4l2_write (unsigned char *data, int len); - if (ao_data.format != AF_FORMAT_MPEG2) return 0;
--- a/libvo/vo_v4l2.c Sun Feb 21 23:30:34 2010 +0000 +++ b/libvo/vo_v4l2.c Sun Feb 21 23:31:56 2010 +0000 @@ -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]"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libvo/vo_v4l2.h Sun Feb 21 23:31:56 2010 +0000 @@ -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 (unsigned char *data, int len); + +#endif /* MPLAYER_VO_V4L2_H */