Commit d8136924 authored by Frank Barchard's avatar Frank Barchard

Rename convert to yuvconvert for linux.mk

TBR=kjellander@chromium.org
BUG=None
TEST=make -f linux.mk

Change-Id: I747c2eb6ed03cacddf3265e65088472507f3436c
Reviewed-on: https://chromium-review.googlesource.com/581874
Commit-Queue: Frank Barchard <fbarchard@google.com>
Reviewed-by: 's avatarFrank Barchard <fbarchard@google.com>
parent 5f005230
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1661 Version: 1662
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1661 #define LIBYUV_VERSION 1662
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_
...@@ -60,14 +60,14 @@ LOCAL_OBJ_FILES := \ ...@@ -60,14 +60,14 @@ LOCAL_OBJ_FILES := \
.c.o: .c.o:
$(CC) -c $(CFLAGS) $*.c -o $*.o $(CC) -c $(CFLAGS) $*.c -o $*.o
all: libyuv.a convert cpuid psnr all: libyuv.a yuvconvert cpuid psnr
libyuv.a: $(LOCAL_OBJ_FILES) libyuv.a: $(LOCAL_OBJ_FILES)
$(AR) $(ARFLAGS) $@ $(LOCAL_OBJ_FILES) $(AR) $(ARFLAGS) $@ $(LOCAL_OBJ_FILES)
# A C++ test utility that uses libyuv conversion. # A C++ test utility that uses libyuv conversion.
convert: util/convert.cc libyuv.a yuvconvert: util/yuvconvert.cc libyuv.a
$(CXX) $(CXXFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a $(CXX) $(CXXFLAGS) -Iutil/ -o $@ util/yuvconvert.cc libyuv.a
# A standalone test utility # A standalone test utility
psnr: util/psnr.cc psnr: util/psnr.cc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment