virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

Replace some forgotten FFmpeg references by Libav.

Browse Source
This commit is contained in:
Diego Biurrun 2011-10-30 18:25:48 +01:00
parent 959cfbf3f4
commit f36b390275
6 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/bfin/fdct_bfin.S
View File

@ -104,14 +104,14 @@ short dct_coef[]
S3,C3, S3,C3,
----------------------------------------------------------- -----------------------------------------------------------
FFMPEG conformance testing results Libav conformance testing results
----------------------------------------------------------- -----------------------------------------------------------
dct-test: modified with the following dct-test: modified with the following
dct_error("BFINfdct", 0, ff_bfin_fdct, fdct, test); dct_error("BFINfdct", 0, ff_bfin_fdct, fdct, test);
produces the following output: produces the following output:
root:/u/ffmpeg/bhead/libavcodec> ./dct-test libavcodec> ./dct-test
ffmpeg DCT/IDCT test Libav DCT/IDCT test
2 -131 -6 -48 -36 33 -83 24 2 -131 -6 -48 -36 33 -83 24
34 52 -24 -15 5 92 57 143 34 52 -24 -15 5 92 57 143
@ -123,8 +123,6 @@ ffmpeg DCT/IDCT test
-17 -63 -15 73 50 -91 159 -14 -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: err_inf=2 err2=0.16425938 syserr=0.00795000 maxout=2098 blockSumErr=27
DCT BFINfdct: 92.1 kdct/s DCT BFINfdct: 92.1 kdct/s
root:/u/ffmpeg/bhead/libavcodec>
*/ */
#include "config.h" #include "config.h"

6
libavcodec/bfin/idct_bfin.S
View File

@ -32,15 +32,15 @@ Performance :
----------------------------------------------------------- -----------------------------------------------------------
FFMPEG conformance testing results Libav conformance testing results
----------------------------------------------------------- -----------------------------------------------------------
dct-test: modified with the following dct-test: modified with the following
dct_error("BFINidct", 1, ff_bfin_idct, idct, test); dct_error("BFINidct", 1, ff_bfin_idct, idct, test);
produces the following output produces the following output
root:/u/ffmpeg/bhead/libavcodec> ./dct-test -i libavcodec> ./dct-test -i
ffmpeg DCT/IDCT test Libav DCT/IDCT test
8 15 -2 21 24 17 0 10 8 15 -2 21 24 17 0 10
2 -10 -5 -5 -3 7 -14 -3 2 -10 -5 -5 -3 7 -14 -3

2
libavcodec/dct-test.c
View File

@ -543,7 +543,7 @@ int main(int argc, char **argv)
if (optind < argc) if (optind < argc)
test = atoi(argv[optind]); test = atoi(argv[optind]);
printf("ffmpeg DCT/IDCT test\n"); printf("Libav DCT/IDCT test\n");
if (test_248_dct) { if (test_248_dct) {
idct248_error("SIMPLE-C", ff_simple_idct248_put, speed); idct248_error("SIMPLE-C", ff_simple_idct248_put, speed);

2
libavcodec/motion-test.c
View File

@ -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 = avcodec_alloc_context3(NULL);
ctx->dsp_mask = AV_CPU_FLAG_FORCE; ctx->dsp_mask = AV_CPU_FLAG_FORCE;

8
libavutil/log.c
View File

@ -53,17 +53,17 @@ static void colored_fputs(int level, const char *str){
#if defined(_WIN32) && !defined(__MINGW32CE__) #if defined(_WIN32) && !defined(__MINGW32CE__)
CONSOLE_SCREEN_BUFFER_INFO con_info; CONSOLE_SCREEN_BUFFER_INFO con_info;
con = GetStdHandle(STD_ERROR_HANDLE); con = GetStdHandle(STD_ERROR_HANDLE);
use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR"); use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") && !getenv("AV_LOG_FORCE_NOCOLOR");
if (use_color) { if (use_color) {
GetConsoleScreenBufferInfo(con, &con_info); GetConsoleScreenBufferInfo(con, &con_info);
attr_orig = con_info.wAttributes; attr_orig = con_info.wAttributes;
background = attr_orig & 0xF0; background = attr_orig & 0xF0;
} }
#elif HAVE_ISATTY #elif HAVE_ISATTY
use_color= !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR") && use_color= !getenv("NO_COLOR") && !getenv("AV_LOG_FORCE_NOCOLOR") &&
(getenv("TERM") && isatty(2) || getenv("FFMPEG_FORCE_COLOR")); (getenv("TERM") && isatty(2) || getenv("AV_LOG_FORCE_COLOR"));
#else #else
use_color= getenv("FFMPEG_FORCE_COLOR") && !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR"); use_color= getenv("AV_LOG_FORCE_COLOR") && !getenv("NO_COLOR") && !getenv("AV_LOG_FORCE_NOCOLOR");
#endif #endif
} }

5
libavutil/parseutils.c
View File

@ -401,10 +401,7 @@ static int date_get_num(const char **pp,
return val; 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; int c, val;