summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>2014-07-01 21:49:40 +0000
committerfbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>2014-07-01 21:49:40 +0000
commitac4f03880c2855f4aa3deac6e36297d261629b84 (patch)
treebbe227ec4af9a4df09483ef79a9b9067c006e823
parent1347fdea0715f8903ab37e07976861f56de17210 (diff)
downloadlibyuv-ac4f03880c2855f4aa3deac6e36297d261629b84.tar.gz
Show jpeg as an option for psnr tool if enabled
BUG=339 TESTED=psnr R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/20809005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1026 16f28f9a-4ce2-e073-06de-1de4eb20be90
-rw-r--r--README.chromium2
-rw-r--r--include/libyuv/version.h2
-rw-r--r--util/psnr_main.cc3
3 files changed, 5 insertions, 2 deletions
diff --git a/README.chromium b/README.chromium
index 9657262..f9fc966 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
-Version: 1025
+Version: 1026
License: BSD
License File: LICENSE
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 1663926..b2ec0c8 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
-#define LIBYUV_VERSION 1025
+#define LIBYUV_VERSION 1026
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
diff --git a/util/psnr_main.cc b/util/psnr_main.cc
index a26bc92..0518ab8 100644
--- a/util/psnr_main.cc
+++ b/util/psnr_main.cc
@@ -121,6 +121,9 @@ double GetMSE(double sse, double size) {
void PrintHelp(const char * program) {
printf("%s [-options] org_seq rec_seq [rec_seq2.. etc]\n", program);
+#ifdef HAVE_JPEG
+ printf("jpeg or raw YUV 420 supported.\n");
+#endif
printf("options:\n");
printf(" -s <width> <height> .... specify YUV size, mandatory if none of the "
"sequences have the\n");