From: "Martin Storsjö" <martin@martin.st>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH] libavcodec, libavdevice: Remove unnecessary includes of version.h
Date: Thu, 24 Feb 2022 15:38:31 +0200
Message-ID: <20220224133831.68259-1-martin@martin.st> (raw)
xvmc.h used FF_API_* macros before, but they were removed in
1c63aed232febf4404659bf006237ee4f7f17c9c, leaving the include
unused.
The ones in android_camera.c and mediacodec_wrapper.c have been
added due to a misunderstanding, fixed in
c0bce367e4932f0fb09195e6978ac1a5a60480a4 and
13b77af2f0b56d6c87bb147947337981c21f4245.
The one in mediacodec.c seems to never have been used at all.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
Sending this one for review split out from the rest of the
patchset it originated in.
---
libavcodec/mediacodec.c | 1 -
libavcodec/mediacodec_wrapper.c | 1 -
libavcodec/xvmc.h | 1 -
libavdevice/android_camera.c | 2 --
4 files changed, 5 deletions(-)
diff --git a/libavcodec/mediacodec.c b/libavcodec/mediacodec.c
index aa14624fd0..33bde8112e 100644
--- a/libavcodec/mediacodec.c
+++ b/libavcodec/mediacodec.c
@@ -35,7 +35,6 @@
#include "ffjni.h"
#include "mediacodecdec_common.h"
-#include "version.h"
AVMediaCodecContext *av_mediacodec_alloc_context(void)
{
diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c
index c829941d6b..8ffc58e1d8 100644
--- a/libavcodec/mediacodec_wrapper.c
+++ b/libavcodec/mediacodec_wrapper.c
@@ -28,7 +28,6 @@
#include "avcodec.h"
#include "ffjni.h"
-#include "version.h"
#include "mediacodec_wrapper.h"
struct JNIAMediaCodecListFields {
diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h
index 78ec4530c2..52e70c0d77 100644
--- a/libavcodec/xvmc.h
+++ b/libavcodec/xvmc.h
@@ -32,7 +32,6 @@
#include <X11/extensions/XvMC.h>
#include "libavutil/attributes.h"
-#include "version.h"
#include "avcodec.h"
/**
diff --git a/libavdevice/android_camera.c b/libavdevice/android_camera.c
index f089d1b6f9..1934999c18 100644
--- a/libavdevice/android_camera.c
+++ b/libavdevice/android_camera.c
@@ -43,8 +43,6 @@
#include "libavutil/threadmessage.h"
#include "libavutil/time.h"
-#include "version.h"
-
/* This image format is available on all Android devices
* supporting the Camera2 API */
#define IMAGE_FORMAT_ANDROID AIMAGE_FORMAT_YUV_420_888
--
2.32.0 (Apple Git-132)
_______________________________________________
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".
next reply other threads:[~2022-02-24 13:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-24 13:38 Martin Storsjö [this message]
2022-02-24 14:34 ` Andreas Rheinhardt
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=20220224133831.68259-1-martin@martin.st \
--to=martin@martin.st \
--cc=andreas.rheinhardt@outlook.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