Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
29ba0911
Commit
29ba0911
authored
Mar 14, 2011
by
Janne Grunau
Committed by
Janne Grunau
Mar 16, 2011
Browse files
replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
parent
070c5d0f
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
21 additions
and
21 deletions
+21
-21
Makefile
Makefile
+1
-1
cmdutils.c
cmdutils.c
+2
-2
configure
configure
+11
-11
libavcodec/utils.c
libavcodec/utils.c
+1
-1
libavdevice/avdevice.c
libavdevice/avdevice.c
+1
-1
libavfilter/avfilter.c
libavfilter/avfilter.c
+1
-1
libavformat/utils.c
libavformat/utils.c
+1
-1
libavutil/utils.c
libavutil/utils.c
+1
-1
libpostproc/postprocess.c
libpostproc/postprocess.c
+1
-1
libswscale/utils.c
libswscale/utils.c
+1
-1
No files found.
Makefile
View file @
29ba0911
...
...
@@ -177,7 +177,7 @@ distclean::
$(RM)
version.h config.
*
libavutil/avconfig.h
config
:
$(SRC_PATH)
/configure
$(
value
FFMPEG
_CONFIGURATION
)
$(SRC_PATH)
/configure
$(
value
LIBAV
_CONFIGURATION
)
# regression tests
...
...
cmdutils.c
View file @
29ba0911
...
...
@@ -397,7 +397,7 @@ static int warned_cfg = 0;
} \
if (flags & SHOW_CONFIG) { \
const char *cfg = libname##_configuration(); \
if (strcmp(
FFMPEG
_CONFIGURATION, cfg)) { \
if (strcmp(
LIBAV
_CONFIGURATION, cfg)) {
\
if (!warned_cfg) { \
fprintf(outstream, \
"%sWARNING: library configuration mismatch\n", \
...
...
@@ -427,7 +427,7 @@ void show_banner(void)
program_name
,
program_birth_year
,
this_year
);
fprintf
(
stderr
,
" built on %s %s with %s %s
\n
"
,
__DATE__
,
__TIME__
,
CC_TYPE
,
CC_VERSION
);
fprintf
(
stderr
,
" configuration: "
FFMPEG
_CONFIGURATION
"
\n
"
);
fprintf
(
stderr
,
" configuration: "
LIBAV
_CONFIGURATION
"
\n
"
);
print_all_libs_info
(
stderr
,
INDENT
|
SHOW_CONFIG
);
print_all_libs_info
(
stderr
,
INDENT
|
SHOW_VERSION
);
}
...
...
configure
View file @
29ba0911
...
...
@@ -1688,7 +1688,7 @@ for v in "$@"; do
r
=
${
v
#*=
}
l
=
${
v
%
"
$r
"
}
r
=
$(
sh_quote
"
$r
"
)
FFMPEG
_CONFIGURATION
=
"
${
FFMPEG
_CONFIGURATION
#
}
${
l
}${
r
}
"
LIBAV
_CONFIGURATION
=
"
${
LIBAV
_CONFIGURATION
#
}
${
l
}${
r
}
"
done
find_things
(){
...
...
@@ -1800,7 +1800,7 @@ done
disabled logging
&&
logfile
=
/dev/null
echo
"#
$0
$
FFMPEG
_CONFIGURATION
"
>
$logfile
echo
"#
$0
$
LIBAV
_CONFIGURATION
"
>
$logfile
set
>>
$logfile
test
-n
"
$cross_prefix
"
&&
enable
cross_compile
...
...
@@ -2495,7 +2495,7 @@ case $target_os in
;;
esac
echo
"config:
$arch
:
$subarch
:
$cpu
:
$target_os
:
$cc_ident
:
$
FFMPEG
_CONFIGURATION
"
>
config.fate
echo
"config:
$arch
:
$subarch
:
$cpu
:
$target_os
:
$cc_ident
:
$
LIBAV
_CONFIGURATION
"
>
config.fate
check_cpp_condition stdlib.h
"defined(__PIC__) || defined(__pic__) || defined(PIC)"
&&
enable
pic
...
...
@@ -3204,9 +3204,9 @@ config_files="$TMPH config.mak"
cat
>
config.mak
<<
EOF
# Automatically generated by configure - do not modify!
ifndef
FFMPEG
_CONFIG_MAK
FFMPEG
_CONFIG_MAK=1
FFMPEG
_CONFIGURATION=
$
FFMPEG
_CONFIGURATION
ifndef
LIBAV
_CONFIG_MAK
LIBAV
_CONFIG_MAK=1
LIBAV
_CONFIGURATION=
$
LIBAV
_CONFIGURATION
prefix=
$prefix
LIBDIR=
\$
(DESTDIR)
$libdir
SHLIBDIR=
\$
(DESTDIR)
$shlibdir
...
...
@@ -3295,9 +3295,9 @@ get_version LIBAVFILTER libavfilter/avfilter.h
cat
>
$TMPH
<<
EOF
/* Automatically generated by configure - do not modify! */
#ifndef
FFMPEG
_CONFIG_H
#define
FFMPEG
_CONFIG_H
#define
FFMPEG
_CONFIGURATION "
$(
c_escape
$
FFMPEG
_CONFIGURATION
)
"
#ifndef
LIBAV
_CONFIG_H
#define
LIBAV
_CONFIG_H
#define
LIBAV
_CONFIGURATION "
$(
c_escape
$
LIBAV
_CONFIGURATION
)
"
#define FFMPEG_LICENSE "
$(
c_escape
$license
)
"
#define FFMPEG_DATADIR "
$(
eval
c_escape
$datadir
)
"
#define CC_TYPE "
$cc_type
"
...
...
@@ -3349,8 +3349,8 @@ LAVFI_TESTS=$(print_enabled -n _test $LAVFI_TESTS)
SEEK_TESTS=
$(
print_enabled
-n
_test
$SEEK_TESTS
)
EOF
echo
"#endif /*
FFMPEG
_CONFIG_H */"
>>
$TMPH
echo
"endif #
FFMPEG
_CONFIG_MAK"
>>
config.mak
echo
"#endif /*
LIBAV
_CONFIG_H */"
>>
$TMPH
echo
"endif #
LIBAV
_CONFIG_MAK"
>>
config.mak
# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
cp_if_changed
$TMPH
config.h
...
...
libavcodec/utils.c
View file @
29ba0911
...
...
@@ -1035,7 +1035,7 @@ unsigned avcodec_version( void )
const
char
*
avcodec_configuration
(
void
)
{
return
FFMPEG
_CONFIGURATION
;
return
LIBAV
_CONFIGURATION
;
}
const
char
*
avcodec_license
(
void
)
...
...
libavdevice/avdevice.c
View file @
29ba0911
...
...
@@ -25,7 +25,7 @@ unsigned avdevice_version(void)
const
char
*
avdevice_configuration
(
void
)
{
return
FFMPEG
_CONFIGURATION
;
return
LIBAV
_CONFIGURATION
;
}
const
char
*
avdevice_license
(
void
)
...
...
libavfilter/avfilter.c
View file @
29ba0911
...
...
@@ -34,7 +34,7 @@ unsigned avfilter_version(void) {
const
char
*
avfilter_configuration
(
void
)
{
return
FFMPEG
_CONFIGURATION
;
return
LIBAV
_CONFIGURATION
;
}
const
char
*
avfilter_license
(
void
)
...
...
libavformat/utils.c
View file @
29ba0911
...
...
@@ -51,7 +51,7 @@ unsigned avformat_version(void)
const
char
*
avformat_configuration
(
void
)
{
return
FFMPEG
_CONFIGURATION
;
return
LIBAV
_CONFIGURATION
;
}
const
char
*
avformat_license
(
void
)
...
...
libavutil/utils.c
View file @
29ba0911
...
...
@@ -31,7 +31,7 @@ unsigned avutil_version(void)
const
char
*
avutil_configuration
(
void
)
{
return
FFMPEG
_CONFIGURATION
;
return
LIBAV
_CONFIGURATION
;
}
const
char
*
avutil_license
(
void
)
...
...
libpostproc/postprocess.c
View file @
29ba0911
...
...
@@ -94,7 +94,7 @@ unsigned postproc_version(void)
const
char
*
postproc_configuration
(
void
)
{
return
FFMPEG
_CONFIGURATION
;
return
LIBAV
_CONFIGURATION
;
}
const
char
*
postproc_license
(
void
)
...
...
libswscale/utils.c
View file @
29ba0911
...
...
@@ -53,7 +53,7 @@ unsigned swscale_version(void)
const
char
*
swscale_configuration
(
void
)
{
return
FFMPEG
_CONFIGURATION
;
return
LIBAV
_CONFIGURATION
;
}
const
char
*
swscale_license
(
void
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment