diff options
| author | James Zern <jzern@google.com> | 2016-02-04 03:43:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-04 03:43:49 +0000 |
| commit | b63788a116d3f503b11bee4797470bd658109530 (patch) | |
| tree | 9decf63b5ce9656e43c3a0991463b1287e521b90 /test/byte_alignment_test.cc | |
| parent | 37c8f57318efd11a1f4cfd38a1c15fdb8ee5c800 (diff) | |
| parent | 81c165973e4a0d9846f01c7228defaac52a5321c (diff) | |
| download | libvpx-b63788a116d3f503b11bee4797470bd658109530.tar libvpx-b63788a116d3f503b11bee4797470bd658109530.tar.gz libvpx-b63788a116d3f503b11bee4797470bd658109530.tar.bz2 libvpx-b63788a116d3f503b11bee4797470bd658109530.zip | |
Merge changes I1171e9c7,I77292e11,I1678ab48,Id7a2c345
* changes:
dct16x16_test: quiet unused-function warning
intrapred: protect functions w/CONFIG check x2
dct32x32_test: remove unused function
tests: quiet some warnings w/--disable-webm-io
Diffstat (limited to 'test/byte_alignment_test.cc')
| -rw-r--r-- | test/byte_alignment_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/byte_alignment_test.cc b/test/byte_alignment_test.cc index aa4b78b9a..3a808b046 100644 --- a/test/byte_alignment_test.cc +++ b/test/byte_alignment_test.cc @@ -21,14 +21,14 @@ namespace { +#if CONFIG_WEBM_IO + const int kLegacyByteAlignment = 0; const int kLegacyYPlaneByteAlignment = 32; const int kNumPlanesToCheck = 3; const char kVP9TestFile[] = "vp90-2-02-size-lf-1920x1080.webm"; const char kVP9Md5File[] = "vp90-2-02-size-lf-1920x1080.webm.md5"; -#if CONFIG_WEBM_IO - struct ByteAlignmentTestParam { int byte_alignment; vpx_codec_err_t expected_value; |