[FFmpeg-cvslog] libavcodec, libavdevice: Remove unnecessary includes of version.h
Martin Storsjö
git at videolan.org
Thu Feb 24 22:36:36 EET 2022
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Feb 23 13:00:09 2022 +0200| [17ab836a5f3fcfb81c98786d86d12e95f875e7f3] | committer: Martin Storsjö
libavcodec, libavdevice: Remove unnecessary includes of version.h
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 at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17ab836a5f3fcfb81c98786d86d12e95f875e7f3
---
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
More information about the ffmpeg-cvslog
mailing list