Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
f36b3902
Commit
f36b3902
authored
Oct 30, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace some forgotten FFmpeg references by Libav.
parent
959cfbf3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
18 deletions
+13
-18
fdct_bfin.S
libavcodec/bfin/fdct_bfin.S
+3
-5
idct_bfin.S
libavcodec/bfin/idct_bfin.S
+3
-3
dct-test.c
libavcodec/dct-test.c
+1
-1
motion-test.c
libavcodec/motion-test.c
+1
-1
log.c
libavutil/log.c
+4
-4
parseutils.c
libavutil/parseutils.c
+1
-4
No files found.
libavcodec/bfin/fdct_bfin.S
View file @
f36b3902
...
...
@@ -104,14 +104,14 @@ short dct_coef[]
S3,C3,
-----------------------------------------------------------
FFMPEG
conformance testing results
Libav
conformance testing results
-----------------------------------------------------------
dct-test: modified with the following
dct_error("BFINfdct", 0, ff_bfin_fdct, fdct, test);
produces the following output:
root:/u/ffmpeg/bhead/
libavcodec> ./dct-test
ffmpeg
DCT/IDCT test
libavcodec> ./dct-test
Libav
DCT/IDCT test
2 -131 -6 -48 -36 33 -83 24
34 52 -24 -15 5 92 57 143
...
...
@@ -123,8 +123,6 @@ ffmpeg DCT/IDCT test
-17 -63 -15 73 50 -91 159 -14
DCT BFINfdct: err_inf=2 err2=0.16425938 syserr=0.00795000 maxout=2098 blockSumErr=27
DCT BFINfdct: 92.1 kdct/s
root:/u/ffmpeg/bhead/libavcodec>
*/
#include "config.h"
...
...
libavcodec/bfin/idct_bfin.S
View file @
f36b3902
...
...
@@ -32,15 +32,15 @@ Performance :
-----------------------------------------------------------
FFMPEG
conformance testing results
Libav
conformance testing results
-----------------------------------------------------------
dct-test: modified with the following
dct_error("BFINidct", 1, ff_bfin_idct, idct, test);
produces the following output
root:/u/ffmpeg/bhead/
libavcodec> ./dct-test -i
ffmpeg
DCT/IDCT test
libavcodec> ./dct-test -i
Libav
DCT/IDCT test
8 15 -2 21 24 17 0 10
2 -10 -5 -5 -3 7 -14 -3
...
...
libavcodec/dct-test.c
View file @
f36b3902
...
...
@@ -543,7 +543,7 @@ int main(int argc, char **argv)
if
(
optind
<
argc
)
test
=
atoi
(
argv
[
optind
]);
printf
(
"
ffmpeg
DCT/IDCT test
\n
"
);
printf
(
"
Libav
DCT/IDCT test
\n
"
);
if
(
test_248_dct
)
{
idct248_error
(
"SIMPLE-C"
,
ff_simple_idct248_put
,
speed
);
...
...
libavcodec/motion-test.c
View file @
f36b3902
...
...
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
}
}
printf
(
"
ffmpeg
motion test
\n
"
);
printf
(
"
Libav
motion test
\n
"
);
ctx
=
avcodec_alloc_context3
(
NULL
);
ctx
->
dsp_mask
=
AV_CPU_FLAG_FORCE
;
...
...
libavutil/log.c
View file @
f36b3902
...
...
@@ -53,17 +53,17 @@ static void colored_fputs(int level, const char *str){
#if defined(_WIN32) && !defined(__MINGW32CE__)
CONSOLE_SCREEN_BUFFER_INFO
con_info
;
con
=
GetStdHandle
(
STD_ERROR_HANDLE
);
use_color
=
(
con
!=
INVALID_HANDLE_VALUE
)
&&
!
getenv
(
"NO_COLOR"
)
&&
!
getenv
(
"
FFMPE
G_FORCE_NOCOLOR"
);
use_color
=
(
con
!=
INVALID_HANDLE_VALUE
)
&&
!
getenv
(
"NO_COLOR"
)
&&
!
getenv
(
"
AV_LO
G_FORCE_NOCOLOR"
);
if
(
use_color
)
{
GetConsoleScreenBufferInfo
(
con
,
&
con_info
);
attr_orig
=
con_info
.
wAttributes
;
background
=
attr_orig
&
0xF0
;
}
#elif HAVE_ISATTY
use_color
=
!
getenv
(
"NO_COLOR"
)
&&
!
getenv
(
"
FFMPE
G_FORCE_NOCOLOR"
)
&&
(
getenv
(
"TERM"
)
&&
isatty
(
2
)
||
getenv
(
"
FFMPE
G_FORCE_COLOR"
));
use_color
=
!
getenv
(
"NO_COLOR"
)
&&
!
getenv
(
"
AV_LO
G_FORCE_NOCOLOR"
)
&&
(
getenv
(
"TERM"
)
&&
isatty
(
2
)
||
getenv
(
"
AV_LO
G_FORCE_COLOR"
));
#else
use_color
=
getenv
(
"
FFMPEG_FORCE_COLOR"
)
&&
!
getenv
(
"NO_COLOR"
)
&&
!
getenv
(
"FFMPE
G_FORCE_NOCOLOR"
);
use_color
=
getenv
(
"
AV_LOG_FORCE_COLOR"
)
&&
!
getenv
(
"NO_COLOR"
)
&&
!
getenv
(
"AV_LO
G_FORCE_NOCOLOR"
);
#endif
}
...
...
libavutil/parseutils.c
View file @
f36b3902
...
...
@@ -401,10 +401,7 @@ static int date_get_num(const char **pp,
return
val
;
}
/* small strptime for ffmpeg */
static
const
char
*
small_strptime
(
const
char
*
p
,
const
char
*
fmt
,
struct
tm
*
dt
)
static
const
char
*
small_strptime
(
const
char
*
p
,
const
char
*
fmt
,
struct
tm
*
dt
)
{
int
c
,
val
;
...
...
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