summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-09-12 18:01:22 -0400
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-09-13 10:57:50 -0400
commit59db014b5b138b9fbae09809b6df7bf9753efdb2 (patch)
tree20b94d2610b30702dbfa91de9a8d41ee05c9046e
parent75f3e0ad9589d8baa89977955a839660442bd0fa (diff)
downloadffmpeg-streaming-59db014b5b138b9fbae09809b6df7bf9753efdb2.zip
ffmpeg-streaming-59db014b5b138b9fbae09809b6df7bf9753efdb2.tar.gz
Revert "lavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE"
You should not need to enable verbose logging and all the output that comes with it in order to get things like the obtained bitrate from a first pass encode. Many things parse this output. Also, since it is marked as info in libx264, it should be marked as info in libavcodec as well. This reverts commit 911519caec2346fc7728bca9840ffc000e866161.
-rw-r--r--libavcodec/libx264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 27dadd4..f2f8990 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -79,7 +79,7 @@ static void X264_log(void *p, int level, const char *fmt, va_list args)
static const int level_map[] = {
[X264_LOG_ERROR] = AV_LOG_ERROR,
[X264_LOG_WARNING] = AV_LOG_WARNING,
- [X264_LOG_INFO] = AV_LOG_VERBOSE,
+ [X264_LOG_INFO] = AV_LOG_INFO,
[X264_LOG_DEBUG] = AV_LOG_DEBUG
};
OpenPOWER on IntegriCloud