[FFmpeg-cvslog] avcodec/codec_par: Move enum AVFieldOrder to defs.h

Andreas Rheinhardt git at videolan.org
Tue Oct 3 03:11:55 EEST 2023


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Sep 26 00:59:21 2023 +0200| [ea14e8bc3028c746290528869600249c7229bd62] | committer: Andreas Rheinhardt

avcodec/codec_par: Move enum AVFieldOrder to defs.h

It is also used by AVCodecContext.

Reviewed-by: James Almer <jamrial at gmail.com>
Reviewed-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea14e8bc3028c746290528869600249c7229bd62
---

 doc/APIchanges         |  3 +++
 libavcodec/codec_par.h | 10 +---------
 libavcodec/defs.h      |  8 ++++++++
 libavcodec/version.h   |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 830bf5a171..e15c715ce1 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
 
 API changes, most recent first:
 
+2023-10-03 - xxxxxxxxxx - lavc 60.28.100 - codec_par.h defs.h
+  Move the definition of enum AVFieldOrder from codec_par.h to defs.h.
+
 2023-10-03 - xxxxxxxxxx - lavf 60.14.100 - avformat.h
   Deprecate AVFMT_ALLOW_FLUSH without replacement. Users can always
   flush any muxer by sending a NULL packet.
diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h
index add90fdb1e..c1679ea042 100644
--- a/libavcodec/codec_par.h
+++ b/libavcodec/codec_par.h
@@ -29,21 +29,13 @@
 #include "libavutil/pixfmt.h"
 
 #include "codec_id.h"
+#include "defs.h"
 
 /**
  * @addtogroup lavc_core
  * @{
  */
 
-enum AVFieldOrder {
-    AV_FIELD_UNKNOWN,
-    AV_FIELD_PROGRESSIVE,
-    AV_FIELD_TT,          ///< Top coded_first, top displayed first
-    AV_FIELD_BB,          ///< Bottom coded first, bottom displayed first
-    AV_FIELD_TB,          ///< Top coded first, bottom displayed first
-    AV_FIELD_BT,          ///< Bottom coded first, top displayed first
-};
-
 /**
  * This struct describes the properties of an encoded stream.
  *
diff --git a/libavcodec/defs.h b/libavcodec/defs.h
index ceed8d5e16..00d840ec19 100644
--- a/libavcodec/defs.h
+++ b/libavcodec/defs.h
@@ -195,6 +195,14 @@
 
 #define AV_LEVEL_UNKNOWN                  -99
 
+enum AVFieldOrder {
+    AV_FIELD_UNKNOWN,
+    AV_FIELD_PROGRESSIVE,
+    AV_FIELD_TT,          ///< Top coded_first, top displayed first
+    AV_FIELD_BB,          ///< Bottom coded first, bottom displayed first
+    AV_FIELD_TB,          ///< Top coded first, bottom displayed first
+    AV_FIELD_BT,          ///< Bottom coded first, top displayed first
+};
 
 /**
  * @ingroup lavc_decoding
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 735c8b813c..87b7284a95 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 
 #include "version_major.h"
 
-#define LIBAVCODEC_VERSION_MINOR  27
+#define LIBAVCODEC_VERSION_MINOR  28
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \



More information about the ffmpeg-cvslog mailing list