From d1ba1dc9c7f5f29da56763a7ebe26b13310fb874 Mon Sep 17 00:00:00 2001
From: Ted Meyer <tmathmeyer@chromium.org>
Date: Wed, 13 Mar 2024 12:24:50 -0700
Subject: [PATCH] Update includes to use <> instead of ""
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Webrtc is build with FFmpeg sources on defined in the include path
through the -I flag, so they should be included this way instead. This
would otherwise cause a conflict when the chromium ffmpeg sources move
from third_party/ffmpeg/* to third_party/ffmpeg/src/*

BUG: chromium:329282834
Change-Id: Id8f7e91446bdc536db77e74388a73e51f5111ffc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/342820
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org>
Cr-Commit-Position: refs/heads/main@{#41899}
---
 modules/video_coding/codecs/h264/h264_color_space.h  |  6 +++---
 .../video_coding/codecs/h264/h264_decoder_impl.cc    | 12 ++++++------
 modules/video_coding/codecs/h264/h264_decoder_impl.h |  9 ++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/modules/video_coding/codecs/h264/h264_color_space.h b/modules/video_coding/codecs/h264/h264_color_space.h
index 392ccaf563..5a93575184 100644
--- a/modules/video_coding/codecs/h264/h264_color_space.h
+++ b/modules/video_coding/codecs/h264/h264_color_space.h
@@ -20,12 +20,12 @@
 #error "See: bugs.webrtc.org/9213#c13."
 #endif
 
-#include "api/video/color_space.h"
-
 extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
+#include <libavcodec/avcodec.h>
 }  // extern "C"
 
+#include "api/video/color_space.h"
+
 namespace webrtc {
 
 // Helper class for extracting color space information from H264 stream.
diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
index 127b70931b..f02caa18ef 100644
--- a/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+++ b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
@@ -16,16 +16,16 @@
 
 #include "modules/video_coding/codecs/h264/h264_decoder_impl.h"
 
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
+}  // extern "C"
+
 #include <algorithm>
 #include <limits>
 #include <memory>
 
-extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
-#include "third_party/ffmpeg/libavformat/avformat.h"
-#include "third_party/ffmpeg/libavutil/imgutils.h"
-}  // extern "C"
-
 #include "api/video/color_space.h"
 #include "api/video/i010_buffer.h"
 #include "api/video/i420_buffer.h"
diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.h b/modules/video_coding/codecs/h264/h264_decoder_impl.h
index 97d091cf4b..e9da6a7a0d 100644
--- a/modules/video_coding/codecs/h264/h264_decoder_impl.h
+++ b/modules/video_coding/codecs/h264/h264_decoder_impl.h
@@ -21,10 +21,6 @@
 #error "See: bugs.webrtc.org/9213#c13."
 #endif
 
-#include <memory>
-
-#include "modules/video_coding/codecs/h264/include/h264.h"
-
 // CAVEAT: According to ffmpeg docs for avcodec_send_packet, ffmpeg requires a
 // few extra padding bytes after the end of input. And in addition, docs for
 // AV_INPUT_BUFFER_PADDING_SIZE says "If the first 23 bits of the additional
@@ -40,11 +36,14 @@
 // passed to ffmpeg.
 
 extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
+#include <libavcodec/avcodec.h>
 }  // extern "C"
 
+#include <memory>
+
 #include "common_video/h264/h264_bitstream_parser.h"
 #include "common_video/include/video_frame_buffer_pool.h"
+#include "modules/video_coding/codecs/h264/include/h264.h"
 
 namespace webrtc {