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

[Andreas Rheinhardt <andreas.rheinhardt@outlook.com>]

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(-)

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
-- 
2.34.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".