diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-10-30 18:25:48 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-11-02 10:42:55 +0100 |
| commit | f36b39027563ad4ef2ab31e87d7da2854eb5cee7 (patch) | |
| tree | 4c5bb4f76f5af2f2a9a0b8093dfdfd7430fbcd44 /libavutil | |
| parent | 959cfbf3f4d20367011be006affff9f5f31ac39d (diff) | |
| download | ffmpeg-f36b39027563ad4ef2ab31e87d7da2854eb5cee7.tar.gz | |
Replace some forgotten FFmpeg references by Libav.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/log.c | 8 | ||||
| -rw-r--r-- | libavutil/parseutils.c | 5 |
2 files changed, 5 insertions, 8 deletions
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; |