diff mbox series

[FFmpeg-devel,5/7] avutil: Move error.h from avutil.h to common.h

Message ID AS8P250MB07448ABF701E1FCF1A0A84518FEBA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit c3e3ea3c8846486dfe81b3761584f7c98ada9c75
Headers show
Series [FFmpeg-devel] avformat/avformat: Avoid including codec.h, frame.h | expand


Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 2, 2023, 4:21 p.m. UTC
Up until now, avutil.h includes common.h which includes mem.h which
includes avutil.h, so that all these headers are in fact equivalent.
Yet mem.h does not need to include avutil.h at all and when it no longer
does, including common.h will no longer include error.h (included by
avutil.h) as well; change this by moving error.h to avutil.h, as error.h
is clearly a commonly used header.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
 libavutil/avutil.h | 1 -
 libavutil/common.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)


Paul B Mahol Sept. 3, 2023, 7:47 a.m. UTC | #1
Probably OK
diff mbox series


diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 64b68bdbd3..30bec192f1 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -294,7 +294,6 @@  char av_get_picture_type_char(enum AVPictureType pict_type);
 #include "common.h"
-#include "error.h"
 #include "rational.h"
 #include "version.h"
 #include "macros.h"
diff --git a/libavutil/common.h b/libavutil/common.h
index fd1404be6c..de2140a678 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -40,6 +40,7 @@ 
 #include <string.h>
 #include "attributes.h"
+#include "error.h"
 #include "macros.h"
 //rounded division & shift