From 33d4b696eba33804da06ae9dda7997feb8b1c50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
Date: Tue, 28 Aug 2018 10:00:08 +0200
Subject: Update libvpx config test

WebRTC requires a newer, unreleased, version of libvpx. The config test should
detect it once it has been released. Until then the bundled version must be
used.

Task-number: QTBUG-70183
Change-Id: Ie97319d3f9560e44ebc823fc07a481696a82648e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 config.tests/libvpx/libvpx.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'config.tests')

diff --git a/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp
index d4b34c6b5..55aef0b92 100644
--- a/config.tests/libvpx/libvpx.cpp
+++ b/config.tests/libvpx/libvpx.cpp
@@ -26,15 +26,16 @@
 **
 ****************************************************************************/
 
-#include <vpx/vpx_frame_buffer.h>
-#include <vpx/vp8cx.h>
-#include <vpx/vp8dx.h>
-
-#ifndef VPX_CTRL_VPXD_GET_LAST_QUANTIZER
-#error "This version of libvpx is too old, it is missing VPX_CTRL_VPXD_GET_LAST_QUANTIZER define"
-#endif
+#include <vpx/vpx_encoder.h>
 
 int main(int, char **)
 {
+    vpx_codec_cx_pkt pkt;
+    // Members added (as ints) by
+    // https://chromium-review.googlesource.com/c/webm/libvpx/+/798222
+    // And changed to int arrays by
+    /  https://chromium-review.googlesource.com/c/webm/libvpx/+/879089
+    pkt.data.frame.width[0] = 0u;
+    pkt.data.frame.height[0] = 0u;
     return 0;
 }
-- 
cgit v1.2.3