From b18b59b8d433f08662461f32e0404609c382d42b Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 21 Feb 2010 23:31:56 +0000 Subject: Add header for v4l2_write() instead of forward declaring it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30692 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_v4l2.c | 3 +-- libvo/vo_v4l2.c | 1 + libvo/vo_v4l2.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 libvo/vo_v4l2.h diff --git a/libao2/ao_v4l2.c b/libao2/ao_v4l2.c index a9e386a448..3781fab359 100644 --- a/libao2/ao_v4l2.c +++ b/libao2/ao_v4l2.c @@ -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 @@ get_space (void) 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; diff --git a/libvo/vo_v4l2.c b/libvo/vo_v4l2.c index f2e6535bab..b60edea878 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..0e6a45522a --- /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 (unsigned char *data, int len); + +#endif /* MPLAYER_VO_V4L2_H */ -- cgit v1.2.3