Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
9d2a0f1c
Commit
9d2a0f1c
authored
18 years ago
by
Måns Rullgård
Browse files
Options
Downloads
Patches
Plain Diff
rename shell variables v4l[2] to video4linux[2]
Originally committed as revision 7023 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
6e7a01e4
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+31
-31
31 additions, 31 deletions
configure
with
31 additions
and
31 deletions
configure
+
31
−
31
View file @
9d2a0f1c
...
@@ -420,8 +420,8 @@ case "$arch" in
...
@@ -420,8 +420,8 @@ case "$arch" in
;;
;;
esac
esac
gprof
=
"no"
gprof
=
"no"
v
4l
=
"yes"
v
ideo4linux
=
"yes"
v
4l
2
=
"yes"
v
ideo4linux
2
=
"yes"
bktr
=
"no"
bktr
=
"no"
audio_oss
=
"yes"
audio_oss
=
"yes"
audio_beos
=
"no"
audio_beos
=
"no"
...
@@ -518,8 +518,8 @@ esac
...
@@ -518,8 +518,8 @@ esac
SHFLAGS
=
-nostart
SHFLAGS
=
-nostart
# disable Linux things
# disable Linux things
audio_oss
=
"no"
audio_oss
=
"no"
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
dv1394
=
"no"
dv1394
=
"no"
# enable BeOS things
# enable BeOS things
audio_beos
=
"yes"
audio_beos
=
"yes"
...
@@ -533,8 +533,8 @@ need_inet_aton="yes"
...
@@ -533,8 +533,8 @@ need_inet_aton="yes"
extralibs
=
"-lnet"
extralibs
=
"-lnet"
fi
;;
fi
;;
SunOS
)
SunOS
)
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
audio_oss
=
"no"
audio_oss
=
"no"
dv1394
=
"no"
dv1394
=
"no"
make
=
"gmake"
make
=
"gmake"
...
@@ -545,8 +545,8 @@ need_inet_aton="yes"
...
@@ -545,8 +545,8 @@ need_inet_aton="yes"
add_extralibs
"-lsocket -lnsl"
add_extralibs
"-lsocket -lnsl"
;;
;;
NetBSD
)
NetBSD
)
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
bktr
=
"yes"
bktr
=
"yes"
audio_oss
=
"yes"
audio_oss
=
"yes"
dv1394
=
"no"
dv1394
=
"no"
...
@@ -554,8 +554,8 @@ make="gmake"
...
@@ -554,8 +554,8 @@ make="gmake"
add_extralibs
"-lossaudio"
add_extralibs
"-lossaudio"
;;
;;
OpenBSD
)
OpenBSD
)
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
bktr
=
"yes"
bktr
=
"yes"
audio_oss
=
"yes"
audio_oss
=
"yes"
dv1394
=
"no"
dv1394
=
"no"
...
@@ -565,8 +565,8 @@ LDCONFIG="ldconfig -m \$(shlibdir)"
...
@@ -565,8 +565,8 @@ LDCONFIG="ldconfig -m \$(shlibdir)"
add_extralibs
"-lossaudio"
add_extralibs
"-lossaudio"
;;
;;
FreeBSD
)
FreeBSD
)
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
bktr
=
"yes"
bktr
=
"yes"
audio_oss
=
"yes"
audio_oss
=
"yes"
dv1394
=
"no"
dv1394
=
"no"
...
@@ -574,16 +574,16 @@ make="gmake"
...
@@ -574,16 +574,16 @@ make="gmake"
add_cflags
"-pthread"
add_cflags
"-pthread"
;;
;;
GNU/kFreeBSD
)
GNU/kFreeBSD
)
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
bktr
=
"yes"
bktr
=
"yes"
audio_oss
=
"yes"
audio_oss
=
"yes"
dv1394
=
"no"
dv1394
=
"no"
add_cflags
"-pthread"
add_cflags
"-pthread"
;;
;;
BSD/OS
)
BSD/OS
)
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
bktr
=
"yes"
bktr
=
"yes"
audio_oss
=
"yes"
audio_oss
=
"yes"
dv1394
=
"no"
dv1394
=
"no"
...
@@ -594,8 +594,8 @@ installstrip=""
...
@@ -594,8 +594,8 @@ installstrip=""
;;
;;
Darwin
)
Darwin
)
cc
=
"cc"
cc
=
"cc"
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
audio_oss
=
"no"
audio_oss
=
"no"
dv1394
=
"no"
dv1394
=
"no"
SHFLAGS
=
"-dynamiclib -Wl,-single_module -Wl,-install_name,
\$
(shlibdir)/
\$
(SLIBNAME),-current_version,
\$
(SPPVERSION),-compatibility_version,
\$
(SPPVERSION)"
SHFLAGS
=
"-dynamiclib -Wl,-single_module -Wl,-install_name,
\$
(shlibdir)/
\$
(SLIBNAME),-current_version,
\$
(SPPVERSION),-compatibility_version,
\$
(SPPVERSION)"
...
@@ -618,8 +618,8 @@ mingw32="yes"
...
@@ -618,8 +618,8 @@ mingw32="yes"
CYGWIN
*
)
CYGWIN
*
)
targetos
=
CYGWIN
targetos
=
CYGWIN
shlibdir
=
'${PREFIX}/bin'
shlibdir
=
'${PREFIX}/bin'
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
audio_oss
=
"yes"
audio_oss
=
"yes"
dv1394
=
"no"
dv1394
=
"no"
VHOOKSHFLAGS
=
'-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKSHFLAGS
=
'-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
...
@@ -638,8 +638,8 @@ LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
...
@@ -638,8 +638,8 @@ LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
IRIX
*
)
IRIX
*
)
targetos
=
IRIX
targetos
=
IRIX
ranlib
=
"echo ignoring ranlib"
ranlib
=
"echo ignoring ranlib"
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
audio_oss
=
"no"
audio_oss
=
"no"
make
=
"gmake"
make
=
"gmake"
;;
;;
...
@@ -659,8 +659,8 @@ SLIBSUF=".dll"
...
@@ -659,8 +659,8 @@ SLIBSUF=".dll"
EXESUF
=
".exe"
EXESUF
=
".exe"
extralibs
=
""
extralibs
=
""
pkg_requires
=
""
pkg_requires
=
""
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
audio_oss
=
"no"
audio_oss
=
"no"
dv1394
=
"no"
dv1394
=
"no"
ffserver
=
"no"
ffserver
=
"no"
...
@@ -753,9 +753,9 @@ for opt do
...
@@ -753,9 +753,9 @@ for opt do
;;
;;
--enable-gprof
)
gprof
=
"yes"
--enable-gprof
)
gprof
=
"yes"
;;
;;
--disable-v4l
)
v
4l
=
"no"
--disable-v4l
)
v
ideo4linux
=
"no"
;;
;;
--disable-v4l2
)
v
4l
2
=
"no"
--disable-v4l2
)
v
ideo4linux
2
=
"no"
;;
;;
--disable-bktr
)
bktr
=
"no"
--disable-bktr
)
bktr
=
"no"
;;
;;
...
@@ -916,8 +916,8 @@ you do not need to pass additional options.
...
@@ -916,8 +916,8 @@ you do not need to pass additional options.
EOF
EOF
exit
1
exit
1
fi
fi
v
4l
=
"no"
v
ideo4linux
=
"no"
v
4l
2
=
"no"
v
ideo4linux
2
=
"no"
bktr
=
"no"
bktr
=
"no"
audio_oss
=
"no"
audio_oss
=
"no"
dv1394
=
"no"
dv1394
=
"no"
...
@@ -1526,7 +1526,7 @@ int main( void ) {
...
@@ -1526,7 +1526,7 @@ int main( void ) {
EOF
EOF
# check for video4linux2 --- V4L2_PIX_FMT_YUV420
# check for video4linux2 --- V4L2_PIX_FMT_YUV420
enabled v
4l
2
&&
check_cc
<<
EOF
|| v
4l
2="no"
enabled v
ideo4linux
2
&&
check_cc
<<
EOF
|| v
ideo4linux
2="no"
#include <sys/time.h>
#include <sys/time.h>
#include <asm/types.h>
#include <asm/types.h>
#include <linux/videodev2.h>
#include <linux/videodev2.h>
...
@@ -1946,12 +1946,12 @@ if test "$mpegaudio_hp" = "yes" ; then
...
@@ -1946,12 +1946,12 @@ if test "$mpegaudio_hp" = "yes" ; then
echo
"#define CONFIG_MPEGAUDIO_HP 1"
>>
$TMPH
echo
"#define CONFIG_MPEGAUDIO_HP 1"
>>
$TMPH
fi
fi
if
test
"
$v
4l
"
=
"yes"
;
then
if
test
"
$v
ideo4linux
"
=
"yes"
;
then
echo
"#define CONFIG_VIDEO4LINUX 1"
>>
$TMPH
echo
"#define CONFIG_VIDEO4LINUX 1"
>>
$TMPH
echo
"CONFIG_VIDEO4LINUX=yes"
>>
config.mak
echo
"CONFIG_VIDEO4LINUX=yes"
>>
config.mak
fi
fi
if
test
"
$v
4l
2
"
=
"yes"
;
then
if
test
"
$v
ideo4linux
2
"
=
"yes"
;
then
echo
"#define CONFIG_VIDEO4LINUX2 1"
>>
$TMPH
echo
"#define CONFIG_VIDEO4LINUX2 1"
>>
$TMPH
echo
"CONFIG_VIDEO4LINUX2=yes"
>>
config.mak
echo
"CONFIG_VIDEO4LINUX2=yes"
>>
config.mak
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment