generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly check for all required bktr headers.

Browse Source 
inspired by a patch from Tatu Kilappa, trilkk iki fi

Originally committed as revision 7374 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-12-24 03:53:15 +00:00
parent 6cf161d21e
commit f8aa696f9f
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@ -455,6 +455,11 @@ HAVE_LIST='
beosthreads beosthreads
byteswap_h byteswap_h
dcbzl dcbzl
dev_bktr_ioctl_bt848_h
dev_bktr_ioctl_meteor_h
dev_ic_bt8xx_h
dev_video_meteor_ioctl_meteor_h
dev_video_bktr_ioctl_bt848_h
dlfcn_h dlfcn_h
dlopen dlopen
freetype2 freetype2
@ -463,6 +468,8 @@ HAVE_LIST='
inet_aton inet_aton
localtime_r localtime_r
lrintf lrintf
machine_ioctl_bt848_h
machine_ioctl_meteor_h
malloc_h malloc_h
memalign memalign
mlib mlib
@ -1660,6 +1667,20 @@ int dummy = V4L2_PIX_FMT_YUV420;
struct v4l2_buffer dummy1; struct v4l2_buffer dummy1;
EOF EOF
# check for ioctl_meteor.h, ioctl_bt848.h and alternatives
if enabled bktr; then
check_header dev/bktr/ioctl_meteor.h
check_header dev/bktr/ioctl_bt848.h
check_header machine/ioctl_meteor.h
check_header machine/ioctl_bt848.h
check_header dev/video/meteor/ioctl_meteor.h
check_header dev/video/bktr/ioctl_bt848.h
check_header dev/ic/bt8xx.h
fi
# Deal with the x11 frame grabber # Deal with the x11 frame grabber
enabled x11grab && enabled x11grab &&
enabled gpl && enabled gpl &&

17
libavformat/grab_bktr.c
View File

@ -24,21 +24,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "avformat.h" #include "avformat.h"
#if defined(__FreeBSD__) #if defined (HAVE_DEV_BKTR_IOCTL_METEOR_H) && defined (HAVE_DEV_BKTR_IOCTL_BT848_H)
# if __FreeBSD__ >= 502100
# include <dev/bktr/ioctl_meteor.h>
# include <dev/bktr/ioctl_bt848.h>
# else
# include <machine/ioctl_meteor.h>
# include <machine/ioctl_bt848.h>
# endif
#elif defined(__FreeBSD_kernel__)
# include <dev/bktr/ioctl_meteor.h> # include <dev/bktr/ioctl_meteor.h>
# include <dev/bktr/ioctl_bt848.h> # include <dev/bktr/ioctl_bt848.h>
#elif defined(__DragonFly__) #elif defined (HAVE_MACHINE_IOCTL_METEOR_H) && defined (HAVE_MACHINE_IOCTL_BT848_H)
# include <machine/ioctl_meteor.h>
# include <machine/ioctl_bt848.h>
#elif defined (HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H) && defined (HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H)
# include <dev/video/meteor/ioctl_meteor.h> # include <dev/video/meteor/ioctl_meteor.h>
# include <dev/video/bktr/ioctl_bt848.h> # include <dev/video/bktr/ioctl_bt848.h>
#else #elif HAVE_DEV_IC_BT8XX_H
# include <dev/ic/bt8xx.h> # include <dev/ic/bt8xx.h>
#endif #endif
#include <unistd.h> #include <unistd.h>