diff options
| -rw-r--r-- | libavcodec/bfin/fdct_bfin.S | 8 | ||||
| -rw-r--r-- | libavcodec/bfin/idct_bfin.S | 6 | ||||
| -rw-r--r-- | libavcodec/dct-test.c | 2 | ||||
| -rw-r--r-- | libavcodec/motion-test.c | 2 | ||||
| -rw-r--r-- | libavutil/log.c | 8 | ||||
| -rw-r--r-- | libavutil/parseutils.c | 5 |
6 files changed, 13 insertions, 18 deletions
diff --git a/libavcodec/bfin/fdct_bfin.S b/libavcodec/bfin/fdct_bfin.S index 4c32436e01..47ec381bf8 100644 --- a/libavcodec/bfin/fdct_bfin.S +++ b/libavcodec/bfin/fdct_bfin.S @@ -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" diff --git a/libavcodec/bfin/idct_bfin.S b/libavcodec/bfin/idct_bfin.S index b3dedd3410..36d50a7007 100644 --- a/libavcodec/bfin/idct_bfin.S +++ b/libavcodec/bfin/idct_bfin.S @@ -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 diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 90707f6181..d30454990a 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -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); diff --git a/libavcodec/motion-test.c b/libavcodec/motion-test.c index 7ac5cc7d4a..f689824f8e 100644 --- a/libavcodec/motion-test.c +++ b/libavcodec/motion-test.c @@ -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; diff --git a/libavutil/log.c b/libavutil/log.c index c44130c26e..4d2b539dee 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -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("FFMPEG_FORCE_NOCOLOR"); + use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") && !getenv("AV_LOG_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("FFMPEG_FORCE_NOCOLOR") && - (getenv("TERM") && isatty(2) || getenv("FFMPEG_FORCE_COLOR")); + use_color= !getenv("NO_COLOR") && !getenv("AV_LOG_FORCE_NOCOLOR") && + (getenv("TERM") && isatty(2) || getenv("AV_LOG_FORCE_COLOR")); #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 } diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index a7a4518215..1f8f7a8d46 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -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; |