Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: uioptt24@gmail.com
To: ffmpeg-devel@ffmpeg.org
Cc: gz83 <uioptt24@gmail.com>
Subject: [FFmpeg-devel] [PATCH] avformat: fix use of undeclared identifier error when compiling Chromium
Date: Tue,  8 Nov 2022 11:48:36 -0800
Message-ID: <20221108194836.1919-1-uioptt24@gmail.com> (raw)

From: gz83 <uioptt24@gmail.com>

Cross-compiling Chromium on Ubuntu 22.04 will encounter errors related
to avformat, because Chromium regularly synchronizes upstream changes,
so now submit code directly to upstream
---
 libavformat/flac_picture.c |  3 ++-
 libavformat/matroskadec.c  | 10 +++++-----
 libavformat/mov.c          | 11 ++++++-----
 libavformat/oggdec.c       |  1 +
 libavformat/riff.c         |  1 +
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c
index b33fee75b4..36d190fdc7 100644
--- a/libavformat/flac_picture.c
+++ b/libavformat/flac_picture.c
@@ -19,9 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
 #include "libavcodec/bytestream.h"
+#include "libavcodec/defs.h"
 #include "libavcodec/png.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "demux.h"
 #include "flac_picture.h"
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index d582f566a2..f7bb962941 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -34,6 +34,11 @@
 #include <inttypes.h>
 #include <stdio.h>
 
+#include "libavcodec/bytestream.h"
+#include "libavcodec/defs.h"
+#include "libavcodec/flac.h"
+#include "libavcodec/mpeg4audio.h"
+#include "libavcodec/packet_internal.h"
 #include "libavutil/avstring.h"
 #include "libavutil/base64.h"
 #include "libavutil/bprint.h"
@@ -50,11 +55,6 @@
 #include "libavutil/time_internal.h"
 #include "libavutil/spherical.h"
 
-#include "libavcodec/bytestream.h"
-#include "libavcodec/flac.h"
-#include "libavcodec/mpeg4audio.h"
-#include "libavcodec/packet_internal.h"
-
 #include "avformat.h"
 #include "avio_internal.h"
 #include "demux.h"
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1f436e21d6..39d2c71edb 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -29,6 +29,12 @@
 #include <limits.h>
 #include <stdint.h>
 
+#include "libavcodec/ac3tab.h"
+#include "libavcodec/defs.h"
+#include "libavcodec/flac.h"
+#include "libavcodec/hevc.h"
+#include "libavcodec/mpegaudiodecheader.h"
+#include "libavcodec/mlp_parse.h"
 #include "libavutil/attributes.h"
 #include "libavutil/bprint.h"
 #include "libavutil/channel_layout.h"
@@ -49,11 +55,6 @@
 #include "libavutil/stereo3d.h"
 #include "libavutil/timecode.h"
 #include "libavutil/uuid.h"
-#include "libavcodec/ac3tab.h"
-#include "libavcodec/flac.h"
-#include "libavcodec/hevc.h"
-#include "libavcodec/mpegaudiodecheader.h"
-#include "libavcodec/mlp_parse.h"
 #include "avformat.h"
 #include "internal.h"
 #include "avio_internal.h"
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 3b19e0bd89..c4321a9436 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -29,6 +29,7 @@
  */
 
 #include <stdio.h>
+#include "libavcodec/defs.h"
 #include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
 #include "avio_internal.h"
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7319406b39..b1cac3171b 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -22,6 +22,7 @@
 #include <stddef.h>
 #include "config.h"
 #include "config_components.h"
+#include "libavcodec/codec_id.h"
 #include "libavutil/macros.h"
 #include "avformat.h"
 #include "internal.h"
-- 
2.38.1.windows.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

             reply	other threads:[~2022-11-08 19:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-08 19:48 uioptt24 [this message]
2022-11-09  2:22 ` "zhilizhao(赵志立)"
2022-11-09  2:41   ` 揚帆起航
2022-11-09  2:58     ` "zhilizhao(赵志立)"
2022-11-09 10:37       ` 揚帆起航
2022-11-19  9:17       ` 揚帆起航

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221108194836.1919-1-uioptt24@gmail.com \
    --to=uioptt24@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git