commit ec6f15079ff373b7651698a68bba7244b3556981
author Wan-Teh Chang <wtc@google.com> Thu May 09 14:01:46 2024 -0700
committer libyuv LUCI CQ <libyuv-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 09 23:02:18 2024 +0000
tree a0100b1a6659b86e8e862c2b956b6eae5bf8d2a2
parent ee830a5f7707570537b2c1701fa88aa64cf1bb6f

Remove unneeded #ifdef HAVE_JPEG code

Change-Id: Ic7e1393b48bec735625197243b3d436ea01cfb07
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5529467
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>

source/convert_argb.cc

diff --git a/source/convert_argb.cc b/source/convert_argb.cc
index f2be3e4..627a620 100644
--- a/source/convert_argb.cc
+++ b/source/convert_argb.cc
@@ -14,9 +14,6 @@
 
 #include "libyuv/convert_from_argb.h"
 #include "libyuv/cpu_id.h"
-#ifdef HAVE_JPEG
-#include "libyuv/mjpeg_decoder.h"
-#endif
 #include "libyuv/planar_functions.h"  // For CopyPlane and ARGBShuffle.
 #include "libyuv/rotate_argb.h"
 #include "libyuv/row.h"

source/planar_functions.cc

diff --git a/source/planar_functions.cc b/source/planar_functions.cc
index 1c94e26..bbb7d44 100644
--- a/source/planar_functions.cc
+++ b/source/planar_functions.cc
@@ -14,9 +14,6 @@
 #include <string.h>  // for memset()
 
 #include "libyuv/cpu_id.h"
-#ifdef HAVE_JPEG
-#include "libyuv/mjpeg_decoder.h"
-#endif
 #include "libyuv/row.h"
 #include "libyuv/scale_row.h"  // for ScaleRowDown2
 

unit_test/convert_argb_test.cc

diff --git a/unit_test/convert_argb_test.cc b/unit_test/convert_argb_test.cc
index 6074c82..8eadba3 100644
--- a/unit_test/convert_argb_test.cc
+++ b/unit_test/convert_argb_test.cc
@@ -19,9 +19,6 @@
 #include "libyuv/convert_from.h"
 #include "libyuv/convert_from_argb.h"
 #include "libyuv/cpu_id.h"
-#ifdef HAVE_JPEG
-#include "libyuv/mjpeg_decoder.h"
-#endif
 #include "../unit_test/unit_test.h"
 #include "libyuv/planar_functions.h"
 #include "libyuv/rotate.h"