Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
0cb88628
Commit
0cb88628
authored
Mar 17, 2011
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
This reverts commit
a03be6e1
.
parent
a6be21d3
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
11 additions
and
11 deletions
+11
-11
cmdutils.c
cmdutils.c
+2
-2
configure
configure
+1
-1
utils.c
libavcodec/utils.c
+1
-1
avdevice.c
libavdevice/avdevice.c
+1
-1
avfilter.c
libavfilter/avfilter.c
+1
-1
utils.c
libavformat/utils.c
+1
-1
utils.c
libavutil/utils.c
+1
-1
postprocess.c
libpostproc/postprocess.c
+1
-1
utils.c
libswscale/utils.c
+1
-1
version.sh
version.sh
+1
-1
No files found.
cmdutils.c
View file @
0cb88628
...
@@ -425,7 +425,7 @@ static void print_all_libs_info(FILE* outstream, int flags)
...
@@ -425,7 +425,7 @@ static void print_all_libs_info(FILE* outstream, int flags)
void
show_banner
(
void
)
void
show_banner
(
void
)
{
{
fprintf
(
stderr
,
"%s version "
LIBAV_VERSION
", Copyright (c) %d-%d the Libav
developers
\n
"
,
fprintf
(
stderr
,
"%s version "
FFMPEG_VERSION
", Copyright (c) %d-%d the FFmpeg
developers
\n
"
,
program_name
,
program_birth_year
,
this_year
);
program_name
,
program_birth_year
,
this_year
);
fprintf
(
stderr
,
" built on %s %s with %s %s
\n
"
,
fprintf
(
stderr
,
" built on %s %s with %s %s
\n
"
,
__DATE__
,
__TIME__
,
CC_TYPE
,
CC_VERSION
);
__DATE__
,
__TIME__
,
CC_TYPE
,
CC_VERSION
);
...
@@ -435,7 +435,7 @@ void show_banner(void)
...
@@ -435,7 +435,7 @@ void show_banner(void)
}
}
void
show_version
(
void
)
{
void
show_version
(
void
)
{
printf
(
"%s "
LIBAV
_VERSION
"
\n
"
,
program_name
);
printf
(
"%s "
FFMPEG
_VERSION
"
\n
"
,
program_name
);
print_all_libs_info
(
stdout
,
SHOW_VERSION
);
print_all_libs_info
(
stdout
,
SHOW_VERSION
);
}
}
...
...
configure
View file @
0cb88628
...
@@ -3296,7 +3296,7 @@ cat > $TMPH <<EOF
...
@@ -3296,7 +3296,7 @@ cat > $TMPH <<EOF
#ifndef LIBAV_CONFIG_H
#ifndef LIBAV_CONFIG_H
#define LIBAV_CONFIG_H
#define LIBAV_CONFIG_H
#define LIBAV_CONFIGURATION "
$(
c_escape
$LIBAV_CONFIGURATION
)
"
#define LIBAV_CONFIGURATION "
$(
c_escape
$LIBAV_CONFIGURATION
)
"
#define
LIBAV
_LICENSE "
$(
c_escape
$license
)
"
#define
FFMPEG
_LICENSE "
$(
c_escape
$license
)
"
#define FFMPEG_DATADIR "
$(
eval
c_escape
$datadir
)
"
#define FFMPEG_DATADIR "
$(
eval
c_escape
$datadir
)
"
#define CC_TYPE "
$cc_type
"
#define CC_TYPE "
$cc_type
"
#define CC_VERSION
$cc_version
#define CC_VERSION
$cc_version
...
...
libavcodec/utils.c
View file @
0cb88628
...
@@ -1084,7 +1084,7 @@ const char *avcodec_configuration(void)
...
@@ -1084,7 +1084,7 @@ const char *avcodec_configuration(void)
const
char
*
avcodec_license
(
void
)
const
char
*
avcodec_license
(
void
)
{
{
#define LICENSE_PREFIX "libavcodec license: "
#define LICENSE_PREFIX "libavcodec license: "
return
LICENSE_PREFIX
LIBAV
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
return
LICENSE_PREFIX
FFMPEG
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
}
}
void
avcodec_init
(
void
)
void
avcodec_init
(
void
)
...
...
libavdevice/avdevice.c
View file @
0cb88628
...
@@ -31,5 +31,5 @@ const char * avdevice_configuration(void)
...
@@ -31,5 +31,5 @@ const char * avdevice_configuration(void)
const
char
*
avdevice_license
(
void
)
const
char
*
avdevice_license
(
void
)
{
{
#define LICENSE_PREFIX "libavdevice license: "
#define LICENSE_PREFIX "libavdevice license: "
return
LICENSE_PREFIX
LIBAV
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
return
LICENSE_PREFIX
FFMPEG
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
}
}
libavfilter/avfilter.c
View file @
0cb88628
...
@@ -40,7 +40,7 @@ const char *avfilter_configuration(void)
...
@@ -40,7 +40,7 @@ const char *avfilter_configuration(void)
const
char
*
avfilter_license
(
void
)
const
char
*
avfilter_license
(
void
)
{
{
#define LICENSE_PREFIX "libavfilter license: "
#define LICENSE_PREFIX "libavfilter license: "
return
LICENSE_PREFIX
LIBAV
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
return
LICENSE_PREFIX
FFMPEG
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
}
}
AVFilterBufferRef
*
avfilter_ref_buffer
(
AVFilterBufferRef
*
ref
,
int
pmask
)
AVFilterBufferRef
*
avfilter_ref_buffer
(
AVFilterBufferRef
*
ref
,
int
pmask
)
...
...
libavformat/utils.c
View file @
0cb88628
...
@@ -60,7 +60,7 @@ const char *avformat_configuration(void)
...
@@ -60,7 +60,7 @@ const char *avformat_configuration(void)
const
char
*
avformat_license
(
void
)
const
char
*
avformat_license
(
void
)
{
{
#define LICENSE_PREFIX "libavformat license: "
#define LICENSE_PREFIX "libavformat license: "
return
LICENSE_PREFIX
LIBAV
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
return
LICENSE_PREFIX
FFMPEG
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
}
}
/* fraction handling */
/* fraction handling */
...
...
libavutil/utils.c
View file @
0cb88628
...
@@ -37,5 +37,5 @@ const char *avutil_configuration(void)
...
@@ -37,5 +37,5 @@ const char *avutil_configuration(void)
const
char
*
avutil_license
(
void
)
const
char
*
avutil_license
(
void
)
{
{
#define LICENSE_PREFIX "libavutil license: "
#define LICENSE_PREFIX "libavutil license: "
return
LICENSE_PREFIX
LIBAV
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
return
LICENSE_PREFIX
FFMPEG
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
}
}
libpostproc/postprocess.c
View file @
0cb88628
...
@@ -100,7 +100,7 @@ const char *postproc_configuration(void)
...
@@ -100,7 +100,7 @@ const char *postproc_configuration(void)
const
char
*
postproc_license
(
void
)
const
char
*
postproc_license
(
void
)
{
{
#define LICENSE_PREFIX "libpostproc license: "
#define LICENSE_PREFIX "libpostproc license: "
return
LICENSE_PREFIX
LIBAV
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
return
LICENSE_PREFIX
FFMPEG
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
}
}
#if HAVE_ALTIVEC_H
#if HAVE_ALTIVEC_H
...
...
libswscale/utils.c
View file @
0cb88628
...
@@ -59,7 +59,7 @@ const char *swscale_configuration(void)
...
@@ -59,7 +59,7 @@ const char *swscale_configuration(void)
const
char
*
swscale_license
(
void
)
const
char
*
swscale_license
(
void
)
{
{
#define LICENSE_PREFIX "libswscale license: "
#define LICENSE_PREFIX "libswscale license: "
return
LICENSE_PREFIX
LIBAV
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
return
LICENSE_PREFIX
FFMPEG
_LICENSE
+
sizeof
(
LICENSE_PREFIX
)
-
1
;
}
}
#define RET 0xC3 //near return opcode for x86
#define RET 0xC3 //near return opcode for x86
...
...
version.sh
View file @
0cb88628
...
@@ -23,7 +23,7 @@ if [ -z "$2" ]; then
...
@@ -23,7 +23,7 @@ if [ -z "$2" ]; then
exit
exit
fi
fi
NEW_REVISION
=
"#define
LIBAV
_VERSION
\"
$version
\"
"
NEW_REVISION
=
"#define
FFMPEG
_VERSION
\"
$version
\"
"
OLD_REVISION
=
$(
cat
version.h 2> /dev/null
)
OLD_REVISION
=
$(
cat
version.h 2> /dev/null
)
# Update version.h only on revision changes to avoid spurious rebuilds
# Update version.h only on revision changes to avoid spurious rebuilds
...
...
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